fix(nsis): ensure that installer process is not killed as child process

Close #2516

package.json

@@ -29,7 +29,7 @@
   "////": "All typings are added into root `package.json` to avoid duplication errors in the IDE compiler (several `node.d.ts` files).",
   "dependencies": {
     "7zip-bin": "~3.1.0",
-    "app-builder-bin": "1.7.1",
+    "app-builder-bin": "1.7.2",
     "archiver": "^2.1.1",
     "async-exit-hook": "^2.0.1",
     "aws-sdk": "^2.205.0",
@@ -40,7 +40,7 @@
     "ejs": "^2.5.7",
     "electron-download-tf": "4.3.4",
     "electron-is-dev": "^0.3.0",
-    "electron-osx-sign": "0.4.9",
+    "electron-osx-sign": "0.4.8",
     "fs-extra-p": "^4.5.2",
     "gitbook-plugin-footer": "^0.0.6",
     "hosted-git-info": "^2.5.0",

packages/builder-util/package.json

@@ -11,7 +11,7 @@
     "out"
   ],
   "dependencies": {
-    "app-builder-bin": "1.7.1",
+    "app-builder-bin": "1.7.2",
     "temp-file": "^3.1.1",
     "fs-extra-p": "^4.5.2",
     "is-ci": "^1.1.0",

packages/electron-builder-lib/package.json

@@ -42,13 +42,13 @@
   "homepage": "https://github.com/electron-userland/electron-builder",
   "dependencies": {
     "7zip-bin": "~3.1.0",
-    "app-builder-bin": "1.7.1",
+    "app-builder-bin": "1.7.2",
     "async-exit-hook": "^2.0.1",
     "bluebird-lst": "^1.0.5",
     "chromium-pickle-js": "^0.2.0",
     "builder-util-runtime": "0.0.0-semantic-release",
     "builder-util": "0.0.0-semantic-release",
-    "electron-osx-sign": "0.4.9",
+    "electron-osx-sign": "0.4.8",
     "electron-publish": "0.0.0-semantic-release",
     "fs-extra-p": "^4.5.2",
     "hosted-git-info": "^2.5.0",

packages/electron-builder-lib/templates/nsis/include/allowOnlyOneInstallerInstance.nsh

@@ -22,8 +22,10 @@
   launch:
 !macroend
 
+Var pid
+
 !macro CHECK_APP_RUNNING
-  ${GetProcessInfo} 0 $0 $1 $2 $3 $4
+  ${GetProcessInfo} 0 $pid $1 $2 $3 $4
   ${if} $3 != "${APP_EXECUTABLE_FILENAME}"
     nsProcess::_FindProcess /NOUNLOAD "${APP_EXECUTABLE_FILENAME}"
     Pop $R0
@@ -38,7 +40,7 @@
       Quit
       doStopProcess:
         DetailPrint 'Closing running "${PRODUCT_NAME}"...'
-        ExecWait 'taskkill /f /t /im "${APP_EXECUTABLE_FILENAME}"' $R0
+        ExecWait 'taskkill /f /t /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid"' $R0
         ${If} $R0 == 0
           # to ensure that files are not "in-use"
           Sleep 100

yarn.lock

@@ -275,25 +275,25 @@ anymatch@^1.3.0:
     micromatch "^2.1.5"
     normalize-path "^2.0.0"
 
-[email protected].1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.7.1.tgz#925967add77c13d387e3fe88359a4b4dce82c525"
+[email protected].2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.7.2.tgz#a764c8e52ecf1b5b068f32c820c6daf1ffed6a8f"
 
-[email protected].1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.7.1.tgz#e5c2b49be82473a737e000cfccfc65a68f9cc62d"
+[email protected].2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.7.2.tgz#c4ee0d950666c97c12a45ac74ec6396be3357644"
 
-[email protected].1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.7.1.tgz#e1ba3d6d645896552b28e4dd05525b39561b9b88"
+[email protected].2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.7.2.tgz#7acac890782f4118f09941b343ba06c56452a6f6"
 
-[email protected].1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.7.1.tgz#c2540eb8b164c91c30bc8cf3f16b5c181f3f5c31"
+[email protected].2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.7.2.tgz#daf67060a6bad8f5f611a0d2876d9db897a83f06"
   optionalDependencies:
-    app-builder-bin-linux "1.7.1"
-    app-builder-bin-mac "1.7.1"
-    app-builder-bin-win "1.7.1"
+    app-builder-bin-linux "1.7.2"
+    app-builder-bin-mac "1.7.2"
+    app-builder-bin-win "1.7.2"
 
 append-transform@^0.4.0:
   version "0.4.0"
@@ -1690,9 +1690,9 @@ electron-is-dev@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.3.0.tgz#14e6fda5c68e9e4ecbeff9ccf037cbd7c05c5afe"
 
-[email protected].9:
-  version "0.4.9"
-  resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.4.9.tgz#575d2a24c2c8bcae41bdfbe61462318ea0f2460a"
+[email protected].8:
+  version "0.4.8"
+  resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.4.8.tgz#f0b9fadded9e1e54ec35fa89877b5c6c34c7bc40"
   dependencies:
     bluebird "^3.5.0"
     compare-version "^0.1.2"