Skip to content

Commit e5682a0

Browse files
committed
feat(nsis): do not prompt user to close app before installing on update
Close #1368
1 parent 912fd0d commit e5682a0

File tree

4 files changed

+19
-22
lines changed

4 files changed

+19
-22
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"sanitize-filename": "^1.6.1",
5757
"semver": "^5.3.0",
5858
"stat-mode": "^0.2.2",
59-
"ts-jsdoc": "^1.0.7",
59+
"ts-jsdoc": "^1.1.0",
6060
"tunnel-agent": "^0.6.0",
6161
"update-notifier": "^2.1.0",
6262
"uuid-1345": "^0.99.6",

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,16 @@
2828
${if} $3 != "${APP_EXECUTABLE_FILENAME}"
2929
${nsProcess::FindProcess} "${APP_EXECUTABLE_FILENAME}" $R0
3030
${If} $R0 == 0
31+
${if} ${Updated}
32+
Goto doStopProcess
33+
${endif}
3134
MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "${PRODUCT_NAME} is running. $\r$\nClick OK to close it and continue with ${MODE}." /SD IDOK IDOK doStopProcess
32-
Quit
33-
doStopProcess:
34-
DetailPrint "Closing running ${PRODUCT_NAME} ..."
35-
${nsProcess::KillProcess} "${APP_EXECUTABLE_FILENAME}" $R0
36-
DetailPrint "Waiting for ${PRODUCT_NAME} to close."
37-
Sleep 2000
35+
Quit
36+
doStopProcess:
37+
DetailPrint "Closing running ${PRODUCT_NAME} ..."
38+
${nsProcess::KillProcess} "${APP_EXECUTABLE_FILENAME}" $R0
39+
DetailPrint "Waiting for ${PRODUCT_NAME} to close."
40+
Sleep 2000
3841
${EndIf}
3942
${nsProcess::Unload}
4043
${endIf}

test/src/ExtraBuildTest.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ test.ifAll.ifLinuxOrDevMac("prepackaged", app({
5454
}
5555
}))
5656

57-
test.ifAll.ifDevOrWinCi("override targets in the config", app({
57+
test.ifAll.ifDevOrLinuxCi("override targets in the config", app({
5858
targets: linuxDirTarget,
5959
}, {
6060
packed: async (context) => {

yarn.lock

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,10 +1079,10 @@ electron-macos-sign@~1.6.0:
10791079
plist "^2.0.1"
10801080

10811081
end-of-stream@^1.0.0:
1082-
version "1.2.0"
1083-
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.2.0.tgz#bce82685eab6262e2a780ae740e6334027c01622"
1082+
version "1.4.0"
1083+
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
10841084
dependencies:
1085-
once "~1.3.0"
1085+
once "^1.4.0"
10861086

10871087
entities@~1.1.1:
10881088
version "1.1.1"
@@ -2412,12 +2412,6 @@ once@^1.3.0, once@^1.4.0:
24122412
dependencies:
24132413
wrappy "1"
24142414

2415-
once@~1.3.0:
2416-
version "1.3.3"
2417-
resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
2418-
dependencies:
2419-
wrappy "1"
2420-
24212415
optimist@^0.6.1, optimist@~0.6.0:
24222416
version "0.6.1"
24232417
resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
@@ -2673,8 +2667,8 @@ readable-stream@^1.1.8, readable-stream@~1.1.9:
26732667
string_decoder "~0.10.x"
26742668

26752669
readable-stream@^2.0.0, readable-stream@^2.0.5:
2676-
version "2.2.3"
2677-
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.3.tgz#9cf49463985df016c8ae8813097a9293a9b33729"
2670+
version "2.2.5"
2671+
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.5.tgz#a0b187304e05bab01a4ce2b4cc9c607d5aa1d606"
26782672
dependencies:
26792673
buffer-shims "^1.0.0"
26802674
core-util-is "~1.0.0"
@@ -3196,9 +3190,9 @@ ts-babel@^2.0.0:
31963190
markdown-it "^8.3.1"
31973191
source-map-support "^0.4.11"
31983192

3199-
ts-jsdoc@^1.0.7:
3200-
version "1.0.7"
3201-
resolved "https://registry.yarnpkg.com/ts-jsdoc/-/ts-jsdoc-1.0.7.tgz#69e05f4aabc18afc9a053737b788d3395473fca6"
3193+
ts-jsdoc@^1.1.0:
3194+
version "1.1.0"
3195+
resolved "https://registry.yarnpkg.com/ts-jsdoc/-/ts-jsdoc-1.1.0.tgz#7154f08c4740adaa5cf69c2fcdfa7ba9f187a1b7"
32023196
dependencies:
32033197
bluebird-lst "^1.0.1"
32043198
chalk "^1.1.3"

0 commit comments

Comments
 (0)