Skip to content

Commit fc98d38

Browse files
committed
support node.EXE as the execPath name
Re: tapjs/tapjs#373
1 parent 54a5298 commit fc98d38

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

index.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -129,16 +129,16 @@ function mungeSh (workingDir, options) {
129129
}
130130

131131
function isCmd (file) {
132-
var comspec = path.basename(process.env.comspec || '', '.exe')
133-
return isWindows && (file === comspec || /^cmd(\.exe)?$/.test(file))
132+
var comspec = path.basename(process.env.comspec || '').replace(/\.exe$/i, '')
133+
return isWindows && (file === comspec || /^cmd(\.exe|\.EXE)?$/.test(file))
134134
}
135135

136136
function mungeCmd (workingDir, options) {
137137
var cmdi = options.args.indexOf('/c')
138138
if (cmdi === -1)
139139
return
140140

141-
var re = /^\s*("*)([^"]*?\b(?:node|iojs)(?:\.exe)?)("*)( .*)?$/
141+
var re = /^\s*("*)([^"]*?\b(?:node|iojs)(?:\.exe|\.EXE)?)("*)( .*)?$/
142142
var npmre = /^\s*("*)([^"]*?\b(?:npm))("*)( |$)/
143143
var path_ = require('path')
144144
if (path_.win32)
@@ -173,13 +173,13 @@ function mungeCmd (workingDir, options) {
173173
}
174174

175175
function isNode (file) {
176-
var cmdname = path.basename(process.execPath, '.exe')
176+
var cmdname = path.basename(process.execPath).replace(/\.exe$/i, '')
177177
return file === 'node' || file === 'iojs' || cmdname === file
178178
}
179179

180180
function mungeNode (workingDir, options) {
181181
options.originalNode = options.file
182-
var command = path.basename(options.file, '.exe')
182+
var command = path.basename(options.file).replace(/\.exe$/i, '')
183183
// make sure it has a main script.
184184
// otherwise, just let it through.
185185
var a = 0
@@ -303,7 +303,7 @@ function mungenpm (workingDir, options) {
303303
}
304304

305305
function munge (workingDir, options) {
306-
options.basename = path.basename(options.file, '.exe')
306+
options.basename = path.basename(options.file).replace(/\.exe$/i, '')
307307

308308
// XXX: dry this
309309
if (isSh(options.basename)) {
@@ -420,7 +420,7 @@ function setup (argv, env) {
420420
fs.chmodSync(workingDir + '/node', '0755')
421421
fs.writeFileSync(workingDir + '/iojs', shim)
422422
fs.chmodSync(workingDir + '/iojs', '0755')
423-
var cmdname = path.basename(process.execPath, '.exe')
423+
var cmdname = path.basename(process.execPath).replace(/\.exe$/i, '')
424424
if (cmdname !== 'iojs' && cmdname !== 'node') {
425425
fs.writeFileSync(workingDir + '/' + cmdname, shim)
426426
fs.chmodSync(workingDir + '/' + cmdname, '0755')

0 commit comments

Comments
 (0)