fix: artifactName for portable

develar · develar · commit 8f6247a6227f · 2017-03-13T10:29:04.000+01:00
Close #1340
diff --git a/packages/electron-builder/src/targets/nsis.ts b/packages/electron-builder/src/targets/nsis.ts
@@ -33,7 +33,7 @@ export default class NsisTarget extends Target {
 
     let options = this.packager.config.nsis || Object.create(null)
     if (targetName !== "nsis") {
-      options = Object.assign(options, (<any>this.packager.config)[targetName === "nsis-web" ? "nsisWeb" : ""])
+      options = Object.assign(options, (<any>this.packager.config)[targetName === "nsis-web" ? "nsisWeb" : targetName])
     }
     this.options = options
 
diff --git a/test/out/windows/__snapshots__/installerTest.js.snap b/test/out/windows/__snapshots__/installerTest.js.snap
@@ -49,6 +49,17 @@ Object {
 }
 `;
 
+exports[`portable - artifactName 1`] = `
+Object {
+  "win": Array [
+    Object {
+      "file": "Test App ßWPortable.1.1.0.exe",
+      "safeArtifactName": "TestApp-1.1.0.exe",
+    },
+  ],
+}
+`;
+
 exports[`portable 1`] = `
 Object {
   "win": Array [
diff --git a/test/src/windows/installerTest.ts b/test/src/windows/installerTest.ts
@@ -121,4 +121,16 @@ test.ifNotCiMac("portable", app({
     nsis: {
     }
   }
+}))
+
+test.ifAll.ifNotCiMac("portable - artifactName", app({
+  targets: Platform.WINDOWS.createTarget(["portable"]),
+  config: {
+    "nsis": {
+      "artifactName": "${productName}Installer.${version}.${ext}"
+    },
+    "portable": {
+      "artifactName": "${productName}Portable.${version}.${ext}"
+    }
+  }
 }))

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ export default class NsisTarget extends Target {`
`33`	`33`
`34`	`34`	`let options = this.packager.config.nsis \|\| Object.create(null)`
`35`	`35`	`if (targetName !== "nsis") {`
`36`		`- options = Object.assign(options, (<any>this.packager.config)[targetName === "nsis-web" ? "nsisWeb" : ""])`
	`36`	`+ options = Object.assign(options, (<any>this.packager.config)[targetName === "nsis-web" ? "nsisWeb" : targetName])`
`37`	`37`	`}`
`38`	`38`	`this.options = options`
`39`	`39`