feat(portable): unpackDirName option for portable

Close #3799
electron-userland · Apr 5, 2019 · 4ee4be6 · 4ee4be6
1 parent 3be0181
commit 4ee4be6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/packages/app-builder-lib/scheme.json b/packages/app-builder-lib/scheme.json
@@ -3797,6 +3797,10 @@
                     "default": true,
                     "description": "If `warningsAsErrors` is `true` (default): NSIS will treat warnings as errors. If `warningsAsErrors` is `false`: NSIS will allow warnings.",
                     "type": "boolean"
+                },
+                "unpackDirName": {
+                    "description": "The unpack directory name in [TEMP](https://www.askvg.com/where-does-windows-store-temporary-files-and-how-to-change-temp-folder-location/) directory.\n\nDefaults to [uuid](https://github.com/segmentio/ksuid) of build (changed on each build of portable executable).",
+                    "type": "string"
                 }
             },
             "title": "PortableOptions",

diff --git a/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts b/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts
@@ -227,8 +227,9 @@ export class NsisTarget extends Target {
 
     this.configureDefinesForAllTypeOfInstaller(defines)
     if (isPortable) {
-      defines.REQUEST_EXECUTION_LEVEL = (options as PortableOptions).requestExecutionLevel || "user"
-      defines.UNPACK_DIR_NAME = await executeAppBuilder(["ksuid"])
+      const portableOptions = options as PortableOptions
+      defines.REQUEST_EXECUTION_LEVEL = portableOptions.requestExecutionLevel || "user"
+      defines.UNPACK_DIR_NAME = portableOptions.unpackDirName || (await executeAppBuilder(["ksuid"]))
     }
     else {
       await this.configureDefines(oneClick, defines)

diff --git a/packages/app-builder-lib/src/targets/nsis/nsisOptions.ts b/packages/app-builder-lib/src/targets/nsis/nsisOptions.ts
@@ -167,6 +167,13 @@ export interface PortableOptions extends TargetSpecificOptions, CommonNsisOption
    * @default user
    */
   readonly requestExecutionLevel?: "user" | "highest" | "admin"
+
+  /**
+   * The unpack directory name in [TEMP](https://www.askvg.com/where-does-windows-store-temporary-files-and-how-to-change-temp-folder-location/) directory.
+   *
+   * Defaults to [uuid](https://github.com/segmentio/ksuid) of build (changed on each build of portable executable).
+   */
+  readonly unpackDirName?: string
 }
 
 /**

diff --git a/test/src/windows/portableTest.ts b/test/src/windows/portableTest.ts
@@ -19,6 +19,7 @@ test.ifAll.ifDevOrWinCi("portable zip", app({
     publish: null,
     portable: {
       useZip: true,
+      unpackDirName: "0ujssxh0cECutqzMgbtXSGnjorm",
     },
     compression: "normal",
   }