Skip to content

Commit 2debda0

Browse files
committed
fix: preserve exit code in .cmd files
Because we're now exiting with an explicit exit command, we have to preserve %errorlevel% (the equivalent of $? in bash).
1 parent c380c2a commit 2debda0

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ function writeShim_ (from, to, prog, args, variables, cb) {
113113
//
114114
// "%_prog%" "%dp0%\.\node_modules\npm\bin\npm-cli.js" %*
115115
// @ENDLOCAL
116-
// @EXIT /b
116+
// @EXIT /b %errorlevel%
117117
//
118118
// :find_dp0
119119
// SET dp0=%~dp0
@@ -124,7 +124,7 @@ function writeShim_ (from, to, prog, args, variables, cb) {
124124
'SETLOCAL\r\n' +
125125
'CALL :find_dp0\r\n'
126126
var foot = 'ENDLOCAL\r\n' +
127-
'EXIT /b\r\n' +
127+
'EXIT /b %errorlevel%\r\n' +
128128
':find_dp0\r\n' +
129129
'SET dp0=%~dp0\r\n' +
130130
'EXIT /b\r\n'

tap-snapshots/test-basic.js-TAP.test.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ IF EXIST "%dp0%\\node.exe" (\\r
1919
\\r
2020
"%_prog%" "%dp0%\\from.env" %*\\r
2121
ENDLOCAL\\r
22-
EXIT /b\\r
22+
EXIT /b %errorlevel%\\r
2323
:find_dp0\\r
2424
SET dp0=%~dp0\\r
2525
EXIT /b\\r
@@ -81,7 +81,7 @@ IF EXIST "%dp0%\\node.exe" (\\r
8181
\\r
8282
"%_prog%" --expose_gc "%dp0%\\from.env.args" %*\\r
8383
ENDLOCAL\\r
84-
EXIT /b\\r
84+
EXIT /b %errorlevel%\\r
8585
:find_dp0\\r
8686
SET dp0=%~dp0\\r
8787
EXIT /b\\r
@@ -144,7 +144,7 @@ IF EXIST "%dp0%\\node.exe" (\\r
144144
\\r
145145
"%_prog%" "%dp0%\\from.env.variables" %*\\r
146146
ENDLOCAL\\r
147-
EXIT /b\\r
147+
EXIT /b %errorlevel%\\r
148148
:find_dp0\\r
149149
SET dp0=%~dp0\\r
150150
EXIT /b\\r
@@ -206,7 +206,7 @@ IF EXIST "%dp0%\\/usr/bin/sh.exe" (\\r
206206
\\r
207207
"%_prog%" "%dp0%\\from.sh" %*\\r
208208
ENDLOCAL\\r
209-
EXIT /b\\r
209+
EXIT /b %errorlevel%\\r
210210
:find_dp0\\r
211211
SET dp0=%~dp0\\r
212212
EXIT /b\\r
@@ -268,7 +268,7 @@ IF EXIST "%dp0%\\/usr/bin/sh.exe" (\\r
268268
\\r
269269
"%_prog%" -x "%dp0%\\from.sh.args" %*\\r
270270
ENDLOCAL\\r
271-
EXIT /b\\r
271+
EXIT /b %errorlevel%\\r
272272
:find_dp0\\r
273273
SET dp0=%~dp0\\r
274274
EXIT /b\\r
@@ -322,7 +322,7 @@ SETLOCAL\\r
322322
CALL :find_dp0\\r
323323
"%dp0%\\from.exe" %*\\r
324324
ENDLOCAL\\r
325-
EXIT /b\\r
325+
EXIT /b %errorlevel%\\r
326326
:find_dp0\\r
327327
SET dp0=%~dp0\\r
328328
EXIT /b\\r
@@ -363,7 +363,7 @@ SETLOCAL\\r
363363
CALL :find_dp0\\r
364364
"%dp0%\\" %*\\r
365365
ENDLOCAL\\r
366-
EXIT /b\\r
366+
EXIT /b %errorlevel%\\r
367367
:find_dp0\\r
368368
SET dp0=%~dp0\\r
369369
EXIT /b\\r
@@ -404,7 +404,7 @@ SETLOCAL\\r
404404
CALL :find_dp0\\r
405405
"%dp0%\\from.exe" %*\\r
406406
ENDLOCAL\\r
407-
EXIT /b\\r
407+
EXIT /b %errorlevel%\\r
408408
:find_dp0\\r
409409
SET dp0=%~dp0\\r
410410
EXIT /b\\r

0 commit comments

Comments
 (0)