Skip to content

Commit 9e85c82

Browse files
committed
fix: regression introduced due to broken batch file label syntax
1 parent a9ea3f8 commit 9e85c82

2 files changed

Lines changed: 18 additions & 18 deletions

File tree

index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ function writeShim_ (from, to, prog, args, variables, cb) {
122122
// Subroutine trick to fix https://github.com/npm/cmd-shim/issues/10
123123
var head = '@ECHO off\r\n' +
124124
'SETLOCAL\r\n' +
125-
'CALL find_dp0\r\n'
125+
'CALL :find_dp0\r\n'
126126
var foot = 'ENDLOCAL\r\n' +
127127
'EXIT /b\r\n' +
128-
'find_dp0:\r\n' +
128+
':find_dp0\r\n' +
129129
'SET dp0=%~dp0\r\n' +
130130
'EXIT /b\r\n'
131131

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
exports[`test/basic.js TAP env shebang > cmd 1`] = `
99
@ECHO off\\r
1010
SETLOCAL\\r
11-
CALL find_dp0\\r
11+
CALL :find_dp0\\r
1212
\\r
1313
IF EXIST "%dp0%\\node.exe" (\\r
1414
SET "_prog=%dp0%\\node.exe"\\r
@@ -20,7 +20,7 @@ IF EXIST "%dp0%\\node.exe" (\\r
2020
"%_prog%" "%dp0%\\from.env" %*\\r
2121
ENDLOCAL\\r
2222
EXIT /b\\r
23-
find_dp0:\\r
23+
:find_dp0\\r
2424
SET dp0=%~dp0\\r
2525
EXIT /b\\r
2626
@@ -70,7 +70,7 @@ exit $ret
7070
exports[`test/basic.js TAP env shebang with args > cmd 1`] = `
7171
@ECHO off\\r
7272
SETLOCAL\\r
73-
CALL find_dp0\\r
73+
CALL :find_dp0\\r
7474
\\r
7575
IF EXIST "%dp0%\\node.exe" (\\r
7676
SET "_prog=%dp0%\\node.exe"\\r
@@ -82,7 +82,7 @@ IF EXIST "%dp0%\\node.exe" (\\r
8282
"%_prog%" --expose_gc "%dp0%\\from.env.args" %*\\r
8383
ENDLOCAL\\r
8484
EXIT /b\\r
85-
find_dp0:\\r
85+
:find_dp0\\r
8686
SET dp0=%~dp0\\r
8787
EXIT /b\\r
8888
@@ -132,7 +132,7 @@ exit $ret
132132
exports[`test/basic.js TAP env shebang with variables > cmd 1`] = `
133133
@ECHO off\\r
134134
SETLOCAL\\r
135-
CALL find_dp0\\r
135+
CALL :find_dp0\\r
136136
@SET NODE_PATH=./lib:%NODE_PATH%\\r
137137
\\r
138138
IF EXIST "%dp0%\\node.exe" (\\r
@@ -145,7 +145,7 @@ IF EXIST "%dp0%\\node.exe" (\\r
145145
"%_prog%" "%dp0%\\from.env.variables" %*\\r
146146
ENDLOCAL\\r
147147
EXIT /b\\r
148-
find_dp0:\\r
148+
:find_dp0\\r
149149
SET dp0=%~dp0\\r
150150
EXIT /b\\r
151151
@@ -195,7 +195,7 @@ exit $ret
195195
exports[`test/basic.js TAP explicit shebang > cmd 1`] = `
196196
@ECHO off\\r
197197
SETLOCAL\\r
198-
CALL find_dp0\\r
198+
CALL :find_dp0\\r
199199
\\r
200200
IF EXIST "%dp0%\\/usr/bin/sh.exe" (\\r
201201
SET "_prog=%dp0%\\/usr/bin/sh.exe"\\r
@@ -207,7 +207,7 @@ IF EXIST "%dp0%\\/usr/bin/sh.exe" (\\r
207207
"%_prog%" "%dp0%\\from.sh" %*\\r
208208
ENDLOCAL\\r
209209
EXIT /b\\r
210-
find_dp0:\\r
210+
:find_dp0\\r
211211
SET dp0=%~dp0\\r
212212
EXIT /b\\r
213213
@@ -257,7 +257,7 @@ exit $ret
257257
exports[`test/basic.js TAP explicit shebang with args > cmd 1`] = `
258258
@ECHO off\\r
259259
SETLOCAL\\r
260-
CALL find_dp0\\r
260+
CALL :find_dp0\\r
261261
\\r
262262
IF EXIST "%dp0%\\/usr/bin/sh.exe" (\\r
263263
SET "_prog=%dp0%\\/usr/bin/sh.exe"\\r
@@ -269,7 +269,7 @@ IF EXIST "%dp0%\\/usr/bin/sh.exe" (\\r
269269
"%_prog%" -x "%dp0%\\from.sh.args" %*\\r
270270
ENDLOCAL\\r
271271
EXIT /b\\r
272-
find_dp0:\\r
272+
:find_dp0\\r
273273
SET dp0=%~dp0\\r
274274
EXIT /b\\r
275275
@@ -319,11 +319,11 @@ exit $ret
319319
exports[`test/basic.js TAP if exists (it does exist) > cmd 1`] = `
320320
@ECHO off\\r
321321
SETLOCAL\\r
322-
CALL find_dp0\\r
322+
CALL :find_dp0\\r
323323
"%dp0%\\from.exe" %*\\r
324324
ENDLOCAL\\r
325325
EXIT /b\\r
326-
find_dp0:\\r
326+
:find_dp0\\r
327327
SET dp0=%~dp0\\r
328328
EXIT /b\\r
329329
@@ -360,11 +360,11 @@ exit $?
360360
exports[`test/basic.js TAP just proceed if reading fails > cmd 1`] = `
361361
@ECHO off\\r
362362
SETLOCAL\\r
363-
CALL find_dp0\\r
363+
CALL :find_dp0\\r
364364
"%dp0%\\" %*\\r
365365
ENDLOCAL\\r
366366
EXIT /b\\r
367-
find_dp0:\\r
367+
:find_dp0\\r
368368
SET dp0=%~dp0\\r
369369
EXIT /b\\r
370370
@@ -401,11 +401,11 @@ exit $?
401401
exports[`test/basic.js TAP no shebang > cmd 1`] = `
402402
@ECHO off\\r
403403
SETLOCAL\\r
404-
CALL find_dp0\\r
404+
CALL :find_dp0\\r
405405
"%dp0%\\from.exe" %*\\r
406406
ENDLOCAL\\r
407407
EXIT /b\\r
408-
find_dp0:\\r
408+
:find_dp0\\r
409409
SET dp0=%~dp0\\r
410410
EXIT /b\\r
411411

0 commit comments

Comments
 (0)