changeset 6224:18e543fd8549

Merge branch 'master' of git://github.com/gperciva/gub
author Phil Holmes <mail@philholmes.net>
date Sun, 14 Oct 2012 13:35:59 +0100
parents 72b46c22bf99 (current diff) 3d2df9737eb5 (diff)
children 1030c9647bad
files
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/nsis/lilypond-prepost.nsh	Sun Oct 14 13:30:52 2012 +0100
+++ b/nsis/lilypond-prepost.nsh	Sun Oct 14 13:35:59 2012 +0100
@@ -159,15 +159,17 @@
 	ReadRegStr $R0 HKCR "Python\shell\open\command" ""
 	;;StrCmp $R0 "" 0 py_auto_file
 	WriteRegStr HKCR "Python\shell" "" "open"
-	# %1 is the PYTHON command, so must be quoted bo the space
-	WriteRegExpandStr HKCR "Python\shell\open\command" "" '"$INSTDIR\usr\bin\python.exe" "%1" %2 %3 %4 %5 %6 %7 %8 %9'
+	# %1 is the PYTHON command, other arguments may contain
+	# filenames, so we quote them all to account for spaces
+	WriteRegExpandStr HKCR "Python\shell\open\command" "" '"$INSTDIR\usr\bin\python.exe" "%1" "%2" "%3" "%4" "%5" "%6" "%7" "%8" "%9"'
 
 ;;py_auto_file:
 	ReadRegStr $R0 HKCR "py_auto_file\shell\open\command" ""
 	;;StrCmp $R0 "" 0 py_end
 	WriteRegStr HKCR "py_auto_file\shell" "" "open"
-	# %1 is the PYTHON command, so must be quoted bo the space
-	WriteRegExpandStr HKCR "py_auto_file\shell\open\command" "" '"$INSTDIR\usr\bin\python.exe" "%1" %2 %3 %4 %5 %6 %7 %8 %9'
+	# %1 is the PYTHON command, other arguments may contain
+	# filenames, so we quote them all to account for spaces
+	WriteRegExpandStr HKCR "py_auto_file\shell\open\command" "" '"$INSTDIR\usr\bin\python.exe" "%1" "%2" "%3" "%4" "%5" "%6" "%7" "%8" "%9"'
 ;;py_end:	
 FunctionEnd