fix: Arguments aren't passed to Electron with portable target

Close #1410
electron-userland · Aug 12, 2017 · 4948bd6 · 4948bd6 · 3n-mb · Jan 9, 2019
1 parent 7755fa4
commit 4948bd6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/packages/electron-builder/templates/nsis/portable.nsi b/packages/electron-builder/templates/nsis/portable.nsi
@@ -1,4 +1,5 @@
 !include "common.nsh"
+!include "StdUtils.nsh"
 
 WindowIcon Off
 AutoCloseWindow True
@@ -17,7 +18,8 @@ Section
 	!insertmacro extractEmbeddedAppPackage
 
   System::Call 'Kernel32::SetEnvironmentVariable(t, t)i ("PORTABLE_EXECUTABLE_DIR", "$EXEDIR").r0'
-	ExecWait "$INSTDIR\${APP_EXECUTABLE_FILENAME}"
+  ${StdUtils.GetAllParameters} $R0 0
+	ExecWait "$INSTDIR\${APP_EXECUTABLE_FILENAME} $R0"
 
   SetOutPath $PLUGINSDIR
 	RMDir /r $INSTDIR

diff --git a/test/fixtures/test-app-one/index.html b/test/fixtures/test-app-one/index.html
@@ -16,7 +16,9 @@ <h1>Hello World!</h1>
     Chrome <script>document.write(process.versions.chrome)</script>,
     and Electron <script>document.write(process.versions.electron)</script>.
 
-    Env: <script>document.write(JSON.stringify(process.env, null, 2))</script>.
+    Args: <script>document.write("<br><br><pre>" + JSON.stringify(require("electron").remote.process.argv, null, 2) + "</pre>")</script>.
+
+    Env: <script>document.write("<br><br><pre>" + JSON.stringify(process.env, null, 2) + "</pre>")</script>.
 
     <button onclick="saveAppData()">Save app data</button>
   </body>

diff --git a/test/src/windows/portableTest.ts b/test/src/windows/portableTest.ts
@@ -14,8 +14,8 @@ test.ifAll.ifNotCiMac("portable", app({
 test.ifNotCiMac("portable - artifactName and request execution level", app({
   targets: Platform.WINDOWS.createTarget(["portable"]),
   config: {
-    "nsis": {
-      "artifactName": "${productName}Installer.${version}.${ext}",
+    nsis: {
+      artifactName: "${productName}Installer.${version}.${ext}",
       installerIcon: "foo test space.ico",
     },
     portable: {