fix(nsis): ia32 Extracting wrong archive

Closes #567
electron-userland · Jul 7, 2016 · 56b3450 · 56b3450
1 parent 7f06e4c
commit 56b3450
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/templates/nsis/installer.nsi b/templates/nsis/installer.nsi
@@ -79,11 +79,15 @@ Section "install"
   RMDir /r $INSTDIR
   SetOutPath $INSTDIR
 
-  ${If} ${RunningX64}
-    Nsis7z::Extract "$PLUGINSDIR\app-64.7z"
-  ${Else}
+  !ifdef APP_64
+    ${If} ${RunningX64}
+      Nsis7z::Extract "$PLUGINSDIR\app-64.7z"
+    ${Else}
+      Nsis7z::Extract "$PLUGINSDIR\app-32.7z"
+    ${EndIf}
+  !else
     Nsis7z::Extract "$PLUGINSDIR\app-32.7z"
-  ${EndIf}
+  !endif
 
 #  <% if(fileAssociation){ %>
     # specify file association

diff --git a/test/src/winPackagerTest.ts b/test/src/winPackagerTest.ts
@@ -34,6 +34,13 @@ test("nsis", () => assertPack("test-app-one", _signed({
   }
 ))
 
+test.ifDevOrLinuxCi("nsis 32", () => assertPack("test-app-one", _signed({
+    targets: Platform.WINDOWS.createTarget(["nsis"], Arch.ia32),
+  }), {
+  useTempDir: true,
+  }
+))
+
 test.ifNotCiOsx("nsis boring", () => assertPack("test-app-one", _signed({
     targets: Platform.WINDOWS.createTarget(["nsis"]),
     devMetadata: {