fix: NSIS Installer Not Working on Second Invocation #722

electron-userland · Sep 4, 2016 · 1b90ec6 · 1b90ec6
1 parent 0f1869b
commit 1b90ec6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/src/targets/nsis.ts b/src/targets/nsis.ts
@@ -229,16 +229,16 @@ export default class NsisTarget extends Target {
           const extensions = asArray(item.ext).map(normalizeExt)
           for (let ext of extensions) {
             const customIcon = await packager.getResource(item.icon, `${extensions[0]}.ico`)
-            let installedIconPath = "${APP_EXECUTABLE_FILENAME},0"
+            let installedIconPath = "$appExe,0"
             if (customIcon != null) {
-              installedIconPath = `resources\\${path.basename(customIcon)}`
+              installedIconPath = `$INSTDIR\\resources\\${path.basename(customIcon)}`
               //noinspection SpellCheckingInspection
               registerFileAssociationsScript += `  File "/oname=${installedIconPath}" "${customIcon}"\n`
             }
 
-            const icon = `"$INSTDIR\\${installedIconPath}"`
+            const icon = `"${installedIconPath}"`
             const commandText = `"Open with ${packager.appInfo.productName}"`
-            const command = '"$INSTDIR\\${APP_EXECUTABLE_FILENAME} $\\"%1$\\""'
+            const command = '"$appExe $\\"%1$\\""'
             registerFileAssociationsScript += `  !insertmacro APP_ASSOCIATE "${ext}" "${item.name}" "${item.description || ""}" ${icon} ${commandText} ${command}\n`
           }
         }

diff --git a/templates/nsis/install.nsh → templates/nsis/installSection.nsh b/templates/nsis/install.nsh → templates/nsis/installSection.nsh
@@ -37,7 +37,6 @@ ${if} $installMode == "all"
   ${endif}
 ${endif}
 
-RMDir /r $INSTDIR
 SetOutPath $INSTDIR
 
 SetCompress off
@@ -51,12 +50,12 @@ SetCompress "${COMPRESS}"
 
 !ifdef APP_64
   ${If} ${RunningX64}
-    Nsis7z::Extract "$PLUGINSDIR\app-64.7z"
+    Nsis7z::ExtractWithDetails "$PLUGINSDIR\app-64.7z" "Installing %s..."
   ${Else}
-    Nsis7z::Extract "$PLUGINSDIR\app-32.7z"
+    Nsis7z::ExtractWithDetails "$PLUGINSDIR\app-32.7z" "Installing %s..."
   ${endif}
 !else
-  Nsis7z::Extract "$PLUGINSDIR\app-32.7z"
+  Nsis7z::ExtractWithDetails "$PLUGINSDIR\app-32.7z" "Installing %s..."
 !endif
 
 File "/oname=${UNINSTALL_FILENAME}" "${UNINSTALLER_OUT_FILE}"
@@ -65,11 +64,12 @@ File "/oname=${UNINSTALL_FILENAME}" "${UNINSTALLER_OUT_FILE}"
 
 StrCpy $startMenuLink "$SMPROGRAMS\${PRODUCT_FILENAME}.lnk"
 StrCpy $desktopLink "$DESKTOP\${PRODUCT_FILENAME}.lnk"
+StrCpy $appExe "$INSTDIR\${APP_EXECUTABLE_FILENAME}"
 
 # create shortcuts in the start menu and on the desktop
 # shortcut for uninstall is bad cause user can choose this by mistake during search, so, we don't add it
-CreateShortCut "$startMenuLink" "$INSTDIR\${APP_EXECUTABLE_FILENAME}" "" "$INSTDIR\${APP_EXECUTABLE_FILENAME}" 0 "" "" "${APP_DESCRIPTION}"
-CreateShortCut "$desktopLink" "$INSTDIR\${APP_EXECUTABLE_FILENAME}" "" "$INSTDIR\${APP_EXECUTABLE_FILENAME}" 0 "" "" "${APP_DESCRIPTION}"
+CreateShortCut "$startMenuLink" "$appExe" "" "$appExe" 0 "" "" "${APP_DESCRIPTION}"
+CreateShortCut "$desktopLink" "$appExe" "" "$appExe" 0 "" "" "${APP_DESCRIPTION}"
 
 WinShell::SetLnkAUMI "$startMenuLink" "${APP_ID}"
 WinShell::SetLnkAUMI "$desktopLink" "${APP_ID}"

diff --git a/templates/nsis/installer.nsi b/templates/nsis/installer.nsi
@@ -28,6 +28,8 @@ Var desktopLink
 
 !ifdef BUILD_UNINSTALLER
   SilentInstall silent
+!else
+  Var appExe
 !endif
 
 Function .onInit
@@ -56,7 +58,7 @@ FunctionEnd
 
 Section "install"
   !ifndef BUILD_UNINSTALLER
-    !include "install.nsh"
+    !include "installSection.nsh"
   !endif
 SectionEnd
 

diff --git a/templates/nsis/multiUser.nsh b/templates/nsis/multiUser.nsh
@@ -29,7 +29,7 @@ Var installMode
         StrCpy $0 $1
         System::Call 'Ole32::CoTaskMemFree(ir2)'
       ${endif}
-      StrCpy $INSTDIR "$0\${PRODUCT_FILENAME}"
+      StrCpy $INSTDIR "$0\${PRODUCT_FILENAME}\${VERSION}"
     !endif
 
     # сhecks registry for previous installation path (both for upgrading, reinstall, or uninstall)
@@ -47,7 +47,7 @@ Var installMode
     StrCpy $installMode all
     SetShellVarContext all
 
-    StrCpy $INSTDIR "$PROGRAMFILES\${PRODUCT_FILENAME}"
+    StrCpy $INSTDIR "$PROGRAMFILES\${PRODUCT_FILENAME}\${VERSION}"
 
     # checks registry for previous installation path (both for upgrading, reinstall, or uninstall)
     ReadRegStr $perMachineInstallationFolder HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation
@@ -72,7 +72,7 @@ Var installMode
 	${endif}
 
 	WriteRegStr SHCTX "${UNINSTALL_REGISTRY_KEY}" "DisplayVersion" "${VERSION}"
-	WriteRegStr SHCTX "${UNINSTALL_REGISTRY_KEY}" "DisplayIcon" "$INSTDIR\${APP_EXECUTABLE_FILENAME},0"
+	WriteRegStr SHCTX "${UNINSTALL_REGISTRY_KEY}" "DisplayIcon" "$appExe,0"
 	WriteRegStr SHCTX "${UNINSTALL_REGISTRY_KEY}" "Publisher" "${COMPANY_NAME}"
 	WriteRegDWORD SHCTX "${UNINSTALL_REGISTRY_KEY}" NoModify 1
 	WriteRegDWORD SHCTX "${UNINSTALL_REGISTRY_KEY}" NoRepair 1