Consolidating fixed path vs ksuid logic for string entries and 'false…

…' (or covers empty strings) (electron-userland#5764)
mmaietta · Jul 24, 2021 · bf60e46 · bf60e46
1 parent 4935bec
commit bf60e46
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts b/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts
@@ -251,10 +251,8 @@ export class NsisTarget extends Target {
       defines.REQUEST_EXECUTION_LEVEL = requestExecutionLevel || "user"
 
       // https://github.com/electron-userland/electron-builder/issues/5764
-      if (typeof unpackDirName === "string") {
+      if (typeof unpackDirName === "string" || !unpackDirName) {
         defines.UNPACK_DIR_NAME = unpackDirName || (await executeAppBuilder(["ksuid"]))
-      } else if (unpackDirName !== false) {
-        defines.UNPACK_DIR_NAME = await executeAppBuilder(["ksuid"])
       }
 
       if (splashImage != null) {

diff --git a/test/src/windows/portableTest.ts b/test/src/windows/portableTest.ts
@@ -39,6 +39,7 @@ test.ifAll.ifNotCi(
       publish: null,
       portable: {
         useZip: true,
+        unpackDirName: false,
       },
       compression: "store",
     },
@@ -57,6 +58,7 @@ test.ifNotCiMac(
           installerIcon: "foo test space.ico",
         },
         portable: {
+          unpackDirName: true,
           requestExecutionLevel: "admin",
           //tslint:disable-next-line:no-invalid-template-strings
           artifactName: "${productName}Portable.${version}.${ext}",