Skip to content

Commit 44b0446

Browse files
authoredMar 15, 2024··
fix(nsis): replace SYSTEMROOT with SYSDIR (#8133)
1 parent c2392de commit 44b0446

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed
 

‎.changeset/popular-jobs-protect.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"app-builder-lib": patch
3+
---
4+
5+
fix: replace SYSTEMROOT with $SYSDIR

‎packages/app-builder-lib/templates/nsis/include/allowOnlyOneInstallerInstance.nsh

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
${nsProcess::FindProcess} "${_FILE}" ${_ERR}
4343
!else
4444
# find process owned by current user
45-
nsExec::Exec `%SYSTEMROOT%\System32\cmd.exe /c tasklist /FI "USERNAME eq %USERNAME%" /FI "IMAGENAME eq ${_FILE}" /FO csv | %SYSTEMROOT%\System32\find.exe "${_FILE}"`
45+
nsExec::Exec `"$SYSDIR\cmd.exe" /c tasklist /FI "USERNAME eq %USERNAME%" /FI "IMAGENAME eq ${_FILE}" /FO csv | "$SYSDIR\find.exe" "${_FILE}"`
4646
Pop ${_ERR}
4747
!endif
4848
!macroend
@@ -73,7 +73,7 @@
7373
!ifdef INSTALL_MODE_PER_ALL_USERS
7474
nsExec::Exec `taskkill /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid"`
7575
!else
76-
nsExec::Exec `%SYSTEMROOT%\System32\cmd.exe /c taskkill /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid" /fi "USERNAME eq %USERNAME%"`
76+
nsExec::Exec `"$SYSDIR\cmd.exe" /c taskkill /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid" /fi "USERNAME eq %USERNAME%"`
7777
!endif
7878
# to ensure that files are not "in-use"
7979
Sleep 300
@@ -91,7 +91,7 @@
9191
!ifdef INSTALL_MODE_PER_ALL_USERS
9292
nsExec::Exec `taskkill /f /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid"`
9393
!else
94-
nsExec::Exec `%SYSTEMROOT%\System32\cmd.exe /c taskkill /f /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid" /fi "USERNAME eq %USERNAME%"`
94+
nsExec::Exec `"$SYSDIR\cmd.exe" /c taskkill /f /im "${APP_EXECUTABLE_FILENAME}" /fi "PID ne $pid" /fi "USERNAME eq %USERNAME%"`
9595
!endif
9696
!insertmacro FIND_PROCESS "${APP_EXECUTABLE_FILENAME}" $R0
9797
${If} $R0 == 0

0 commit comments

Comments
 (0)
Please sign in to comment.