[Greater-commits] r3871 - trunk/packaging

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2012-01-03 11:03:27 +0100 (Tue, 03 Jan 2012)
New Revision: 3871

Modified:
   trunk/packaging/greater-installer.nsi
   trunk/packaging/makeinstaller.py
Log:
Fix shortcuts for spaces with paths when autologin is disabled


Modified: trunk/packaging/greater-installer.nsi
===================================================================
--- trunk/packaging/greater-installer.nsi	2011-12-21 11:56:06 UTC (rev 3870)
+++ trunk/packaging/greater-installer.nsi	2012-01-03 10:03:27 UTC (rev 3871)
@@ -338,7 +338,7 @@
   goto no_start_menu
   no_autologin:
   CreateShortCut "$SMPROGRAMS\${productname}\${productname_short} Sediment.lnk" \
-                 "$INSTDIR\python\pythonw.exe" "$INSTDIR\GREAT-ER-Sediment\${executable}" \
+                 "$INSTDIR\python\pythonw.exe" '"$INSTDIR\GREAT-ER-Sediment\${executable}"' \
                  "$INSTDIR\GREAT-ER-Sediment\Resources\greater2.ico"
 
   no_start_menu:
@@ -359,7 +359,7 @@
   goto no_desktop
   desktop_no_autologin:
   CreateShortCut "$DESKTOP\${productname_short} Sediment.lnk" \
-                 "$INSTDIR\python\pythonw.exe" "$INSTDIR\GREAT-ER-Sediment\${executable}" \
+                 "$INSTDIR\python\pythonw.exe" '"$INSTDIR\GREAT-ER-Sediment\${executable}"' \
                  "$INSTDIR\GREAT-ER-Sediment\Resources\greater2.ico"
   no_desktop:
 
@@ -401,7 +401,7 @@
   goto manuals
   no_autologin_2:
   CreateShortCut "$SMPROGRAMS\${productname}\${productname_short}.lnk" \
-                 "$INSTDIR\python\pythonw.exe" "$INSTDIR\GREAT-ER-CEFIC\${executable}" \
+                 "$INSTDIR\python\pythonw.exe" '"$INSTDIR\GREAT-ER-CEFIC\${executable}"' \
                  "$INSTDIR\GREAT-ER-CEFIC\Resources\greater2.ico"
   manuals:
   CreateDirectory "$SMPROGRAMS\${productname}\Documentation"
@@ -426,7 +426,7 @@
   goto no_desktop2
   no_autologin3:
   CreateShortCut "$DESKTOP\${productname_short}.lnk" \
-                 "$INSTDIR\python\pythonw.exe" "$INSTDIR\GREAT-ER-CEFIC\${executable}" \
+                 "$INSTDIR\python\pythonw.exe" '"$INSTDIR\GREAT-ER-CEFIC\${executable}"' \
                  "$INSTDIR\GREAT-ER-CEFIC\Resources\greater2.ico"
   no_desktop2:
 

Modified: trunk/packaging/makeinstaller.py
===================================================================
--- trunk/packaging/makeinstaller.py	2011-12-21 11:56:06 UTC (rev 3870)
+++ trunk/packaging/makeinstaller.py	2012-01-03 10:03:27 UTC (rev 3871)
@@ -41,7 +41,7 @@
         "productname_short" : "GREAT-ER",
         "description" : ("Geo-referenced Regional Exposure "
                          "Assessment Tool for European Rivers"),
-        "version_number" : "3.0.2.0",
+        "version_number" : "3.0.2.1",
         "version_date" : time.strftime("%Y-%m-%d-%H-%M")}