app-builder-lib 22.14.10 → 22.14.11

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # app-builder-lib
 
+## 22.14.11
+
+### Patch Changes
+
+- [#6472](https://github.com/electron-userland/electron-builder/pull/6472) [`e3d06afa`](https://github.com/electron-userland/electron-builder/commit/e3d06afae1236d44e4b6e670b453b260b1f74d84) Thanks [@I-Otsuki](https://github.com/I-Otsuki)! - fix(nsis): Ignore other users processes when installing for only current user
+  Closes #6104
+
 ## 22.14.10
 
 ### Patch Changes

package/out/version.d.ts

@@ -1 +1 @@
-export declare const PACKAGE_VERSION = "22.14.10";
+export declare const PACKAGE_VERSION = "22.14.11";

package/out/version.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PACKAGE_VERSION = void 0;
-exports.PACKAGE_VERSION = "22.14.10";
+exports.PACKAGE_VERSION = "22.14.11";
 //# sourceMappingURL=version.js.map

package/out/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,UAAU,CAAA","sourcesContent":["export const PACKAGE_VERSION = \"22.14.10\"\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,UAAU,CAAA","sourcesContent":["export const PACKAGE_VERSION = \"22.14.11\"\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "app-builder-lib",
 	"description": "electron-builder lib",
-	"version": "22.14.10",
+	"version": "22.14.11",
 	"main": "out/index.js",
 	"files": [
 		"out",
@@ -96,13 +96,13 @@
 		"@babel/preset-react": "7.14.5",
 		"@types/debug": "4.1.7",
 		"@types/ejs": "3.1.0",
-		"@types/fs-extra": "9.0.12",
+		"@types/fs-extra": "9.0.13",
 		"@types/hosted-git-info": "3.0.2",
 		"@types/is-ci": "3.0.0",
 		"@types/js-yaml": "4.0.3",
 		"@types/semver": "7.3.8",
-		"dmg-builder": "22.14.10",
-		"electron-builder-squirrel-windows": "22.14.10"
+		"dmg-builder": "22.14.11",
+		"electron-builder-squirrel-windows": "22.14.11"
 	},
 	"//": "electron-builder-squirrel-windows and dmg-builder added as dev dep for tests (as otherwise `require` doesn't work using Yarn 2)",
 	"typings": "./out/index.d.ts"

package/templates/nsis/include/allowOnlyOneInstallerInstance.nsh

@@ -35,6 +35,16 @@
     !endif
 !macroend
 
+!macro FIND_PROCESS _FILE _ERR
+  !ifdef INSTALL_MODE_PER_ALL_USERS
+    ${nsProcess::FindProcess} "${_FILE}" ${_ERR}
+  !else
+    # find process owned by current user
+    nsExec::Exec `cmd /c tasklist /FI "USERNAME eq %USERNAME%" /FI "IMAGENAME eq ${_FILE}" | find "${_FILE}"`
+    Pop ${_ERR}
+  !endif
+!macroend
+
 !macro _CHECK_APP_RUNNING
   ${GetProcessInfo} 0 $pid $1 $2 $3 $4
   ${if} $3 != "${APP_EXECUTABLE_FILENAME}"
@@ -43,7 +53,7 @@
       Sleep 300
     ${endIf}
 
-    ${nsProcess::FindProcess} "${APP_EXECUTABLE_FILENAME}" $R0
+    !insertmacro FIND_PROCESS "${APP_EXECUTABLE_FILENAME}" $R0
     ${if} $R0 == 0
       ${if} ${isUpdated}
         # allow app to exit without explicit kill
@@ -58,7 +68,11 @@
       DetailPrint `Closing running "${PRODUCT_NAME}"...`
 
       # https://github.com/electron-userland/electron-builder/issues/2516#issuecomment-372009092
-      nsExec::Exec `taskkill /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid"` $R0
+      !ifdef INSTALL_MODE_PER_ALL_USERS
+        nsExec::Exec `taskkill /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid"`
+      !else
+        nsExec::Exec `cmd /c taskkill /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid" /fi "USERNAME eq %USERNAME%"`
+      !endif
       # to ensure that files are not "in-use"
       Sleep 300
 
@@ -68,13 +82,18 @@
       loop:
         IntOp $R1 $R1 + 1
 
-        ${nsProcess::FindProcess} "${APP_EXECUTABLE_FILENAME}" $R0
+        !insertmacro FIND_PROCESS "${APP_EXECUTABLE_FILENAME}" $R0
         ${if} $R0 == 0
           # wait to give a chance to exit gracefully
           Sleep 1000
-          nsExec::Exec `taskkill /f /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid"` $R0
-          ${If} $R0 != 0
-            DetailPrint `Waiting for "${PRODUCT_NAME}" to close (taskkill exit code $R0).`
+          !ifdef INSTALL_MODE_PER_ALL_USERS
+            nsExec::Exec `taskkill /f /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid"`
+          !else
+            nsExec::Exec `cmd /c taskkill /f /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid" /fi "USERNAME eq %USERNAME%"`
+          !endif
+          !insertmacro FIND_PROCESS "${APP_EXECUTABLE_FILENAME}" $R0
+          ${If} $R0 == 0
+            DetailPrint `Waiting for "${PRODUCT_NAME}" to close.`
             Sleep 2000
           ${else}
             Goto not_running