From 1f2234c169aa3e2f832ac51e4fb2da9ec5065dd0 Mon Sep 17 00:00:00 2001
From: Ivan Mahonin <bh@icystar.com>
Date: Jun 16 2018 06:27:52 +0000
Subject: fix NSIS uninstallers again


---

diff --git a/docker-builder-data/build/script/packet/opentoonz-nsis.files/opentoonz.nsi b/docker-builder-data/build/script/packet/opentoonz-nsis.files/opentoonz.nsi
index 4333b47..c91443a 100644
--- a/docker-builder-data/build/script/packet/opentoonz-nsis.files/opentoonz.nsi
+++ b/docker-builder-data/build/script/packet/opentoonz-nsis.files/opentoonz.nsi
@@ -159,7 +159,6 @@ Section "Uninstall"
   Delete "$DESKTOP\${PK_NAME_FULL}.lnk"
   Delete "$SMPROGRAMS\${PK_NAME_FULL}\${PK_NAME_FULL}.lnk"
   Delete "$SMPROGRAMS\${PK_NAME_FULL}\Uninstall ${PK_NAME_FULL}.lnk"
-  RMDir "$SMPROGRAMS\${PK_NAME_FULL}"
 
   ; Remove directories used
   RMDir "$SMPROGRAMS\${PK_NAME_FULL}"
@@ -205,7 +204,7 @@ Function .onInit
   Return
 
 oops:
-  MessageBox MB_YESNO|MB_ICONEXCLAMATION "Another version of ${PK_NAME_FULL} appears to be installed, we recommend to uninstall it first. Do you wish to continue with installation of this version anyway?" IDNO cancel
+  MessageBox MB_YESNO|MB_ICONEXCLAMATION "Another version of OpenToonz appears to be installed, we recommend to make backup of the Stuff directory and uninstall another version first. Do you wish to continue with installation of this version anyway?" IDNO cancel
   BringToFront
   Return
 
diff --git a/docker-builder-data/build/script/packet/opentoonz-nsis.sh b/docker-builder-data/build/script/packet/opentoonz-nsis.sh
index 1154e73..1e2e8b7 100644
--- a/docker-builder-data/build/script/packet/opentoonz-nsis.sh
+++ b/docker-builder-data/build/script/packet/opentoonz-nsis.sh
@@ -54,11 +54,16 @@ pkinstall_release() {
     # copy NSIS configuration
     cp "$FILES_PACKET_DIR/opentoonz.nsi" "./" || return 1
 
+    local LOCAL_OPENTOONZ_NAME_FULL="OpenToonz"
+    if [ "$ARCH" != "64" ]; then
+        LOCAL_OPENTOONZ_NAME_FULL="$LOCAL_OPENTOONZ_NAME_FULL $ARCH"
+    fi
+
     # create config.nsh (see opentoons.nsi)
     cat > config.nsh << EOF
 !define PK_NAME         "OpenToonz" 
-!define PK_NAME_FULL    "OpenToonz"
-!define PK_ARCH         "$ARCH"
+!define PK_NAME_FULL    "${LOCAL_OPENTOONZ_NAME_FULL}"
+!define PK_ARCH         "${ARCH}"
 !define PK_VERSION      "${LOCAL_VERSION2}"
 !define PK_VERSION_FULL "${LOCAL_VERSION}-${LOCAL_COMMIT:0:5}" 
 !define PK_EXECUTABLE   "bin\\\${PK_NAME}_${LOCAL_VERSION2}.exe" 
diff --git a/docker-builder-data/build/script/packet/synfigstudio-nsis.files/synfigstudio.nsi b/docker-builder-data/build/script/packet/synfigstudio-nsis.files/synfigstudio.nsi
index ed53b1a..2cab7be 100644
--- a/docker-builder-data/build/script/packet/synfigstudio-nsis.files/synfigstudio.nsi
+++ b/docker-builder-data/build/script/packet/synfigstudio-nsis.files/synfigstudio.nsi
@@ -171,10 +171,9 @@ Section "Uninstall"
   Delete "$SMPROGRAMS\${PK_DIR_NAME}\${PK_NAME_FULL}.lnk"
   Delete "$SMPROGRAMS\${PK_DIR_NAME}\Uninstall ${PK_NAME_FULL}.lnk"
   Delete "$SMPROGRAMS\${PK_DIR_NAME}\${PK_NAME_FULL} (Debug Console).lnk"
-  RMDir "$SMPROGRAMS\${PK_DIR_NAME}"
 
   ; Remove directories used
-  RMDir "$SMPROGRAMS\${PK_NAME_FULL}"
+  RMDir "$SMPROGRAMS\${PK_DIR_NAME}"
   RMDir "$INSTDIR"
 
   System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
@@ -199,8 +198,8 @@ Function .onInit
   Return
 
 oops:
-  MessageBox MB_YESNOCANCEL|MB_ICONEXCLAMATION "Another version of ${PK_NAME_FULL} appears to be installed. Would you like to uninstall it first?" IDNO ignore IDCANCEL cancel
-  ExecWait '$R0 _?=$INSTDIR'
+  MessageBox MB_YESNOCANCEL|MB_ICONEXCLAMATION "Another version of this software appears to be installed. Would you like to uninstall it first?" IDNO ignore IDCANCEL cancel
+  ExecWait '$R0'
   BringToFront
   Return
 
diff --git a/docker-builder-data/build/script/packet/synfigstudio-nsis.sh b/docker-builder-data/build/script/packet/synfigstudio-nsis.sh
index 7dcd8de..934c2de 100644
--- a/docker-builder-data/build/script/packet/synfigstudio-nsis.sh
+++ b/docker-builder-data/build/script/packet/synfigstudio-nsis.sh
@@ -90,12 +90,17 @@ pkinstall_release() {
         LOCAL_SYNFIG_DIR_NAME="$LOCAL_SYNFIG_DIR_NAME $ARCH"
     fi
 
+    local LOCAL_SYNFIG_NAME_FULL="Synfig Studio"
+    if [ "$ARCH" != "64" ]; then
+        LOCAL_SYNFIG_NAME_FULL="$LOCAL_SYNFIG_NAME_FULL $ARCH"
+    fi
+
     # create config.nsh (see opentoons.nsi)
     cat > config.nsh << EOF
 !define PK_NAME          "synfigstudio" 
 !define PK_DIR_NAME      "${LOCAL_SYNFIG_DIR_NAME}" 
-!define PK_NAME_FULL     "Synfig Studio"
-!define PK_ARCH          "$ARCH"
+!define PK_NAME_FULL     "${LOCAL_SYNFIG_NAME_FULL}"
+!define PK_ARCH          "${ARCH}"
 !define PK_VERSION       "${LOCAL_VERSION2}"
 !define PK_VERSION_FULL  "${LOCAL_VERSION}-${LOCAL_COMMIT:0:5}"
 !define PK_EXECUTABLE    "bin\\synfigstudio.exe"