client: pythonw.exe got running directory prefix at the url handling scheme

9cd81448 · Csók Tamás · 37f8fbdb · 9cd81448 · 9cd81448 · 9cd81448
Commit 9cd81448 authored Sep 03, 2014 by Csók Tamás
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

dist/CIRCLE_Client_Setup.exe
+0 -0

src/iss/installer/win_install.py
+4 -2

src/python/win_install.py
+4 -2

No files found.
--- a/dist/CIRCLE_Client_Setup.exe
+++ b/dist/CIRCLE_Client_Setup.exe
--- a/src/iss/installer/win_install.py
+++ b/src/iss/installer/win_install.py
@@ -10,6 +10,7 @@ import argparse
 import subprocess
 import pythoncom
 import shutil
+import sys
 from win32com.shell import shell, shellcon
 import windowsclasses
 try:
@@ -144,8 +145,9 @@ def main():
                    ('circle\\URL Protocol', ""),
                    ('circle\\DefaultIcon', args.location+"cloud.ico"),
                    ('circle\\shell', {'open': {
-                        'command': "\"pythonw.exe\" \"%s" % args.location
+                        'command': r'"%s\pythonw.exe"' % sys.exec_prefix
-                        + "cloud.py\" \"%1\""}})])
+                        + r' "%s' % args.location
+                        + r'\cloud.py" "%1"'}})])
                custom_protocol_register(custom_protocol)
            except:
                print "Error! URL Protocol handler installation aborted!"

--- a/src/python/win_install.py
+++ b/src/python/win_install.py
@@ -10,6 +10,7 @@ import argparse
 import subprocess
 import pythoncom
 import shutil
+import sys
 from win32com.shell import shell, shellcon
 import windowsclasses
 try:
@@ -144,8 +145,9 @@ def main():
                    ('circle\\URL Protocol', ""),
                    ('circle\\DefaultIcon', args.location+"cloud.ico"),
                    ('circle\\shell', {'open': {
-                        'command': "\"pythonw.exe\" \"%s" % args.location
+                        'command': r'"%s\pythonw.exe"' % sys.exec_prefix
-                        + "cloud.py\" \"%1\""}})])
+                        + r' "%s' % args.location
+                        + r'\cloud.py" "%1"'}})])
                custom_protocol_register(custom_protocol)
            except:
                print "Error! URL Protocol handler installation aborted!"