From bf60e46beca004c41e0966bf51ccec3ece67d696 Mon Sep 17 00:00:00 2001 From: Mike Date: Sat, 24 Jul 2021 09:04:03 -0700 Subject: [PATCH] Consolidating fixed path vs ksuid logic for string entries and 'false' (or covers empty strings) (#5764) --- packages/app-builder-lib/src/targets/nsis/NsisTarget.ts | 4 +--- test/src/windows/portableTest.ts | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts b/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts index 3af308d98c..8fcf0c1ebf 100644 --- 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 index ca3ef42397..e3d201df51 100644 --- 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}",