fix(nsis): respect --force-run when RUN_AFTER_FINISH is false

Close electron-userland#3093

package.json

@@ -42,7 +42,7 @@
     "electron-osx-sign": "0.4.10",
     "env-paths": "^1.0.0",
     "fs-extra-p": "^4.6.1",
-    "hosted-git-info": "^2.6.1",
+    "hosted-git-info": "^2.7.1",
     "iconv-lite": "^0.4.23",
     "ini": "^1.3.5",
     "is-ci": "^1.1.0",
@@ -69,15 +69,15 @@
     "yargs": "^12.0.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0-beta.51",
-    "@babel/preset-env": "^7.0.0-beta.51",
-    "@babel/preset-react": "^7.0.0-beta.51",
-    "@babel/preset-stage-0": "^7.0.0-beta.51",
+    "@babel/core": "^7.0.0-beta.52",
+    "@babel/preset-env": "^7.0.0-beta.52",
+    "@babel/preset-react": "^7.0.0-beta.52",
+    "@babel/preset-stage-0": "^7.0.0-beta.52",
     "@types/debug": "^0.0.30",
     "@types/ejs": "^2.6.0",
     "@types/electron-is-dev": "^0.3.0",
     "@types/ini": "^1.3.29",
-    "@types/jest": "^23.1.4",
+    "@types/jest": "^23.1.5",
     "@types/js-yaml": "^3.11.2",
     "@types/lodash.isequal": "^4.5.2",
     "@types/node-emoji": "^1.8.0",

packages/electron-builder-lib/package.json

@@ -51,7 +51,7 @@
     "electron-osx-sign": "0.4.10",
     "electron-publish": "0.0.0-semantic-release",
     "fs-extra-p": "^4.6.1",
-    "hosted-git-info": "^2.6.1",
+    "hosted-git-info": "^2.7.1",
     "is-ci": "^1.1.0",
     "isbinaryfile": "^3.0.2",
     "js-yaml": "^3.12.0",

packages/electron-builder-lib/templates/nsis/installSection.nsh

@@ -83,11 +83,16 @@ ${endIf}
 !macroend
 
 !ifdef ONE_CLICK
+  # https://github.com/electron-userland/electron-builder/pull/3093#issuecomment-403734568
   !ifdef RUN_AFTER_FINISH
     ${ifNot} ${Silent}
     ${orIf} ${isForceRun}
       !insertmacro doStartApp
     ${endIf}
+  !else
+    ${if} ${isForceRun}
+      !insertmacro doStartApp
+    ${endIf}
   !endif
   !insertmacro quitSuccess
 !else