From: Neil <neil@dip.sun.ac.za>
Date: Sun, 18 May 2014 00:13:23 +0000 (+0200)
Subject: Fix windows installer name
X-Git-Tag: 0.1~1
X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;h=27a386ea056067416da4341bafd4239c3dc63dcb;p=naja.git

Fix windows installer name
---

diff --git a/packaging/naja.nsi b/packaging/naja.nsi
index 12ef327..55d6856 100644
--- a/packaging/naja.nsi
+++ b/packaging/naja.nsi
@@ -9,9 +9,9 @@
   !define WS_UNPACK "naja-${WS_VERSION}"
   !define DIST_FOLDER "../dist"
 
-  Name "Robolock"
+  Name "Robolock II"
   OutFile "${DIST_FOLDER}\naja-${WS_VERSION}.exe"
-  InstallDir "$PROGRAMFILES\Robolock-${WS_VERSION}"
+  InstallDir "$PROGRAMFILES\Robolock_II-${WS_VERSION}"
 
 ; Interface Settings
 
@@ -80,7 +80,7 @@ done:
 
 SectionEnd
 
-Section "Robolock"
+Section "Robolock II"
   SetOutPath "$INSTDIR"
 
   WriteUninstaller "$INSTDIR\${UNINSTALLER}"
@@ -91,23 +91,23 @@ Section "Robolock"
   ZipDLL::extractall "$INSTDIR\${WS_PY2EXE_ZIP}" "$INSTDIR"
   Delete "$INSTDIR\${WS_PY2EXE_ZIP}"
 
-  CreateDirectory "$SMPROGRAMS\Robolock"
+  CreateDirectory "$SMPROGRAMS\Robolock II"
 
   # link.lnk target.exe
   #   parameters icon.file icon_index_number start_options
   #   keyboard_shortcut description
 
-  CreateShortCut "$SMPROGRAMS\Robolock\Robolock ${WS_VERSION}.lnk" "$INSTDIR\${WS_UNPACK}\naja.exe" \
+  CreateShortCut "$SMPROGRAMS\Robolock II\Robolock II ${WS_VERSION}.lnk" "$INSTDIR\${WS_UNPACK}\naja.exe" \
      "" "$INSTDIR\${WS_UNPACK}\${WS_WINDOWS_ICON}" "" SW_SHOWNORMAL \
-     "" "Robolock"
+     "" "Robolock II"
 
-  CreateShortCut "$SMPROGRAMS\Robolock\Uninstall Robolock ${WS_VERSION}.lnk" "$INSTDIR\${UNINSTALLER}" \
+  CreateShortCut "$SMPROGRAMS\Robolock II\Uninstall Robolock II ${WS_VERSION}.lnk" "$INSTDIR\${UNINSTALLER}" \
      "" "" "" SW_SHOWNORMAL \
-     "" "Uninstall Robolock"
+     "" "Uninstall Robolock II"
 
 SectionEnd
 
-UninstallText "This will uninstall Robolock ${WS_VERSION}."
+UninstallText "This will uninstall Robolock II ${WS_VERSION}."
 UninstallIcon "${WS_ICON}"
 
 Section "Uninstall"
@@ -119,12 +119,12 @@ Section "Uninstall"
   RMDir /r /REBOOTOK "$INSTDIR\${WS_UNPACK}"
 
   ; Remove shortcut links
-  Delete "$SMPROGRAMS\Robolock\Robolock ${WS_VERSION}.lnk"
-  Delete "$SMPROGRAMS\Robolock\Uninstall Robolock ${WS_VERSION}.lnk"
+  Delete "$SMPROGRAMS\Robolock II\Robolock II ${WS_VERSION}.lnk"
+  Delete "$SMPROGRAMS\Robolock II\Uninstall Robolock II ${WS_VERSION}.lnk"
 
   ; Remove shortcut folder if no links left
-  IfFileExists "$SMPROGRAMS\Robolock\*.lnk" shortcuts_exist 0
-    RMDir /REBOOTOK "$SMPROGRAMS\Robolock"
+  IfFileExists "$SMPROGRAMS\Robolock II\*.lnk" shortcuts_exist 0
+    RMDir /REBOOTOK "$SMPROGRAMS\Robolock II"
   shortcuts_exist:
 
   ; Final Clean up (no point doing this while the uninstall is incomplete)
diff --git a/packaging/wine-py2exe b/packaging/wine-py2exe
index d8746c8..cb3c658 100755
--- a/packaging/wine-py2exe
+++ b/packaging/wine-py2exe
@@ -17,7 +17,7 @@ WINE_SYS32=`winepath "C:/windows/system32"`
 
 echo "=== Running wine python setup.py ==="
 echo ""
-echo "  Robolock version: ${WS_VERSION}"
+echo "  Robolock II version: ${WS_VERSION}"
 echo "  Writing log to ${PY2EXE_LOG}."
 echo ""
 echo "  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"