feature(portable): allowing splash image to be defined relative to th…

…e project directory (#4990)
electron-userland · Sep 17, 2020 · b087954 · b087954
1 parent 36319d9
commit b087954
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts b/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts
@@ -233,7 +233,7 @@ export class NsisTarget extends Target {
       defines.UNPACK_DIR_NAME = portableOptions.unpackDirName || (await executeAppBuilder(["ksuid"]))
 
       if (portableOptions.splashImage != null) {
-        defines.SPLASH_IMAGE = portableOptions.splashImage
+        defines.SPLASH_IMAGE = path.resolve(packager.projectDir, portableOptions.splashImage)
       }
     }
     else {

diff --git a/packages/app-builder-lib/templates/nsis/portable.nsi b/packages/app-builder-lib/templates/nsis/portable.nsi
@@ -8,7 +8,9 @@ AutoCloseWindow True
 RequestExecutionLevel ${REQUEST_EXECUTION_LEVEL}
 
 Function .onInit
-  SetSilent silent
+  !ifndef SPLASH_IMAGE
+    SetSilent silent
+  !endif
 
   !insertmacro check64BitAndSetRegView
 FunctionEnd