File tree Expand file tree Collapse file tree 4 files changed +19
-22
lines changed
packages/electron-builder/templates/nsis Expand file tree Collapse file tree 4 files changed +19
-22
lines changed Original file line number Diff line number Diff line change 56
56
"sanitize-filename" : " ^1.6.1" ,
57
57
"semver" : " ^5.3.0" ,
58
58
"stat-mode" : " ^0.2.2" ,
59
- "ts-jsdoc" : " ^1.0.7 " ,
59
+ "ts-jsdoc" : " ^1.1.0 " ,
60
60
"tunnel-agent" : " ^0.6.0" ,
61
61
"update-notifier" : " ^2.1.0" ,
62
62
"uuid-1345" : " ^0.99.6" ,
Original file line number Diff line number Diff line change 28
28
${if} $3 != " ${APP_EXECUTABLE_FILENAME}"
29
29
${nsProcess::FindProcess } " ${APP_EXECUTABLE_FILENAME}" $R0
30
30
${If} $R0 == 0
31
+ ${if} ${Updated}
32
+ Goto doStopProcess
33
+ ${endif}
31
34
MessageBox MB_OKCANCEL |MB_ICONEXCLAMATION " ${PRODUCT_NAME} is running. $\r$\n Click 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
38
41
${EndIf}
39
42
${nsProcess::Unload }
40
43
${endIf}
Original file line number Diff line number Diff line change @@ -54,7 +54,7 @@ test.ifAll.ifLinuxOrDevMac("prepackaged", app({
54
54
}
55
55
} ) )
56
56
57
- test . ifAll . ifDevOrWinCi ( "override targets in the config" , app ( {
57
+ test . ifAll . ifDevOrLinuxCi ( "override targets in the config" , app ( {
58
58
targets : linuxDirTarget ,
59
59
} , {
60
60
packed : async ( context ) => {
Original file line number Diff line number Diff line change @@ -1079,10 +1079,10 @@ electron-macos-sign@~1.6.0:
1079
1079
plist "^2.0.1"
1080
1080
1081
1081
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 "
1084
1084
dependencies :
1085
- once "~1.3 .0"
1085
+ once "^1.4 .0"
1086
1086
1087
1087
entities@~1.1.1 :
1088
1088
version "1.1.1"
@@ -2412,12 +2412,6 @@ once@^1.3.0, once@^1.4.0:
2412
2412
dependencies :
2413
2413
wrappy "1"
2414
2414
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
-
2421
2415
optimist@^0.6.1, optimist@~0.6.0 :
2422
2416
version "0.6.1"
2423
2417
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:
2673
2667
string_decoder "~0.10.x"
2674
2668
2675
2669
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 "
2678
2672
dependencies :
2679
2673
buffer-shims "^1.0.0"
2680
2674
core-util-is "~1.0.0"
@@ -3196,9 +3190,9 @@ ts-babel@^2.0.0:
3196
3190
markdown-it "^8.3.1"
3197
3191
source-map-support "^0.4.11"
3198
3192
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 "
3202
3196
dependencies :
3203
3197
bluebird-lst "^1.0.1"
3204
3198
chalk "^1.1.3"
You can’t perform that action at this time.
0 commit comments