fix(nsis): Ensure application name sub-folder on fresh installs. (#7552)

* fix(nsis): Ensure application name sub-folder on fresh installs. During the first program install when the selected directory doesn't exist, it's not enforced that the path contains the application name as a sub-folder. On subsequent installs e.g. on-update, that condition is enforced though, which creates a new installation in sub-folder. Fixes: #6885
electron-userland · May 31, 2023 · e3fc9b5 · e3fc9b5
1 parent 80a3ae8
commit e3fc9b5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.changeset/two-goats-shop.md b/.changeset/two-goats-shop.md
@@ -0,0 +1,5 @@
+---
+"app-builder-lib": patch
+---
+
+fix(nsis): Ensure application name sub-folder on fresh installs.
diff --git a/packages/app-builder-lib/templates/nsis/assistedInstaller.nsh b/packages/app-builder-lib/templates/nsis/assistedInstaller.nsh
@@ -31,11 +31,9 @@
 
     # sanitize the MUI_PAGE_DIRECTORY result to make sure it has a application name sub-folder
     Function instFilesPre
-      ${If} ${FileExists} "$INSTDIR\*"
-        ${StrContains} $0 "${APP_FILENAME}" $INSTDIR
-        ${If} $0 == ""
-          StrCpy $INSTDIR "$INSTDIR\${APP_FILENAME}"
-        ${endIf}
+      ${StrContains} $0 "${APP_FILENAME}" $INSTDIR
+      ${If} $0 == ""
+        StrCpy $INSTDIR "$INSTDIR\${APP_FILENAME}"
       ${endIf}
     FunctionEnd
   !endif