summarylogtreecommitdiffstats
path: root/running-the-server.patch
diff options
context:
space:
mode:
authorScore_Under2015-06-22 05:05:17 +0100
committerScore_Under2015-06-22 05:05:17 +0100
commit1456b2c513291693cf9b72b62da5fbd0f32cb23a (patch)
tree0b3e100c07149e1387ac7804860038698dcaeae3 /running-the-server.patch
parent91fc191e031be486eff9f7a0a0466ee4ecd13ca0 (diff)
downloadaur-1456b2c513291693cf9b72b62da5fbd0f32cb23a.tar.gz
Update for v161
Diffstat (limited to 'running-the-server.patch')
-rw-r--r--running-the-server.patch14
1 files changed, 6 insertions, 8 deletions
diff --git a/running-the-server.patch b/running-the-server.patch
index 28dfd8b41f13..b7a7f00052e3 100644
--- a/running-the-server.patch
+++ b/running-the-server.patch
@@ -1,24 +1,22 @@
diff --git a/include/ClientGUI.py b/include/ClientGUI.py
-index ea9f71f..3edbf21 100755
+index 08b3e1e..7bdf441 100755
--- a/include/ClientGUI.py
+++ b/include/ClientGUI.py
-@@ -234,20 +234,7 @@ class FrameGUI( ClientGUICommon.FrameThatResizes ):
+@@ -237,18 +237,7 @@ class FrameGUI( ClientGUICommon.FrameThatResizes ):
- HydrusData.ShowText( u'Starting server\u2026' )
+ my_scriptname = sys.argv[0]
-- my_scriptname = sys.argv[0]
--
- if my_scriptname.endswith( 'pyw' ):
-
- if HC.PLATFORM_WINDOWS or HC.PLATFORM_OSX: python_bin = 'pythonw'
- else: python_bin = 'python'
-
-- subprocess.Popen( python_bin + ' "' + HC.BASE_DIR + os.path.sep + 'server.pyw"', shell = True )
+- subprocess.Popen( [ python_bin, HC.BASE_DIR + os.path.sep + 'server.pyw' ] )
-
- else:
-
-- if HC.PLATFORM_WINDOWS: subprocess.Popen( '"' + HC.BASE_DIR + os.path.sep + 'server.exe"', shell = True )
-- else: subprocess.Popen( '"./' + HC.BASE_DIR + os.path.sep + 'server"', shell = True )
+- if HC.PLATFORM_WINDOWS: subprocess.Popen( [ HC.BASE_DIR + os.path.sep + 'server.exe' ] )
+- else: subprocess.Popen( [ './' + HC.BASE_DIR + os.path.sep + 'server' ] )
-
+ subprocess.Popen( ["hydrus-server"] )