Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add proper support for PowerShell #34

Closed
wants to merge 1 commit into from
Closed

Add proper support for PowerShell #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
52 changes: 51 additions & 1 deletion index.js
View file
Open in desktop
Expand Up @@ -77,17 +77,21 @@ function writeShim_ (from, to, prog, args, cb) {
, longProg
, shProg = prog && prog.split("\\").join("/")
, shLongProg
, pwshProg = shProg && "\"" + shProg + "$exe\""
, pwshLongProg
shTarget = shTarget.split("\\").join("/")
args = args || ""
if (!prog) {
prog = "\"%~dp0\\" + target + "\""
shProg = "\"$basedir/" + shTarget + "\""
pwshProg = shProg
args = ""
target = ""
shTarget = ""
} else {
longProg = "\"%~dp0\\" + prog + ".exe\""
shLongProg = "\"$basedir/" + prog + "\""
pwshLongProg = "\"$basedir/" + prog + "$exe\""
target = "\"%~dp0\\" + target + "\""
shTarget = "\"$basedir/" + shTarget + "\""
}
Expand Down Expand Up @@ -153,7 +157,52 @@ function writeShim_ (from, to, prog, args, cb) {
+ "exit $?\n"
}

var then = times(2, next, cb)
// #!/usr/bin/env pwsh
// $basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
//
// $ret=0
// $exe = ""
// if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
// # Fix case when both the Windows and Linux builds of Node
// # are installed in the same directory
// $exe = ".exe"
// }
// if (Test-Path "$basedir/node") {
// & "$basedir/node$exe" "$basedir/node_modules/npm/bin/npm-cli.js" $args
// $ret=$LASTEXITCODE
// } else {
// & "node$exe" "$basedir/node_modules/npm/bin/npm-cli.js" $args
// $ret=$LASTEXITCODE
// }
// exit $ret
var pwsh = "#!/usr/bin/env pwsh\n"
+ "$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent\n"
+ "\n"
+ "$exe=\"\"\n"
+ "if ($PSVersionTable.PSVersion -lt \"6.0\" -or $IsWindows) {\n"
+ " # Fix case when both the Windows and Linux builds of Node\n"
+ " # are installed in the same directory\n"
+ " $exe=\".exe\"\n"
+ "}\n"
if (shLongProg) {
pwsh = pwsh
+ "$ret=0\n"
+ "if (Test-Path " + pwshLongProg + ") {\n"
+ " & " + pwshLongProg + " " + args + " " + shTarget + " $args\n"
+ " $ret=$LASTEXITCODE\n"
+ "} else {\n"
+ " & " + pwshProg + " " + args + " " + shTarget + " $args\n"
+ " $ret=$LASTEXITCODE\n"
+ "}\n"
+ "exit $ret\n"
} else {
pwsh = pwsh
+ "& " + pwshProg + " " + args + " " + shTarget + " $args\n"
+ "exit $LASTEXITCODE\n"
}

var then = times(3, next, cb)
fs.writeFile(to + ".ps1", pwsh, "utf8", then)
fs.writeFile(to + ".cmd", cmd, "utf8", then)
fs.writeFile(to, sh, "utf8", then)
function next () {
Expand All @@ -165,6 +214,7 @@ function chmodShim (to, cb) {
var then = times(2, cb, cb)
fs.chmod(to, 0755, then)
fs.chmod(to + ".cmd", 0755, then)
fs.chmod(to + ".ps1", 0755, then)
}

function times(n, ok, cb) {
Expand Down
99 changes: 99 additions & 0 deletions test/basic.js
View file
Open in desktop
Expand Up @@ -16,6 +16,19 @@ test('no shebang', function (t) {
"\"$basedir/from.exe\" \"$@\"\nexit $?\n")
t.equal(fs.readFileSync(to + '.cmd', 'utf8'),
"@\"%~dp0\\from.exe\" %*\r\n")
t.equal(fs.readFileSync(to + '.ps1', 'utf8'),
'#!/usr/bin/env pwsh'+
'\n$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent'+
'\n'+
'\n$exe=""'+
'\nif ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {'+
'\n # Fix case when both the Windows and Linux builds of Node'+
'\n # are installed in the same directory'+
'\n $exe=".exe"'+
'\n}'+
'\n& "$basedir/from.exe" $args'+
'\nexit $LASTEXITCODE'+
'\n')
t.end()
})
})
Expand All @@ -28,6 +41,7 @@ test('env shebang', function (t) {
throw er
console.error('%j', fs.readFileSync(to, 'utf8'))
console.error('%j', fs.readFileSync(to + '.cmd', 'utf8'))
console.error('%j', fs.readFileSync(to + '.ps1', 'utf8'))

t.equal(fs.readFileSync(to, 'utf8'),
"#!/bin/sh"+
Expand All @@ -54,6 +68,26 @@ test('env shebang', function (t) {
"\n @SET PATHEXT=%PATHEXT:;.JS;=;%\r"+
"\n node \"%~dp0\\from.env\" %*\r"+
"\n)")
t.equal(fs.readFileSync(to + '.ps1', 'utf8'),
'#!/usr/bin/env pwsh'+
'\n$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent'+
'\n'+
'\n$exe=""'+
'\nif ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {'+
'\n # Fix case when both the Windows and Linux builds of Node'+
'\n # are installed in the same directory'+
'\n $exe=".exe"'+
'\n}'+
'\n$ret=0'+
'\nif (Test-Path "$basedir/node$exe") {'+
'\n & "$basedir/node$exe" "$basedir/from.env" $args'+
'\n $ret=$LASTEXITCODE'+
'\n} else {'+
'\n & "node$exe" "$basedir/from.env" $args'+
'\n $ret=$LASTEXITCODE'+
'\n}'+
'\nexit $ret'+
'\n')
t.end()
})
})
Expand All @@ -66,6 +100,7 @@ test('env shebang with args', function (t) {
throw er
console.error('%j', fs.readFileSync(to, 'utf8'))
console.error('%j', fs.readFileSync(to + '.cmd', 'utf8'))
console.error('%j', fs.readFileSync(to + '.ps1', 'utf8'))

t.equal(fs.readFileSync(to, 'utf8'),
"#!/bin/sh"+
Expand All @@ -92,6 +127,26 @@ test('env shebang with args', function (t) {
"\n @SET PATHEXT=%PATHEXT:;.JS;=;%\r"+
"\n node --expose_gc \"%~dp0\\from.env.args\" %*\r"+
"\n)")
t.equal(fs.readFileSync(to + '.ps1', 'utf8'),
'#!/usr/bin/env pwsh'+
'\n$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent'+
'\n'+
'\n$exe=""'+
'\nif ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {'+
'\n # Fix case when both the Windows and Linux builds of Node'+
'\n # are installed in the same directory'+
'\n $exe=".exe"'+
'\n}'+
'\n$ret=0'+
'\nif (Test-Path "$basedir/node$exe") {'+
'\n & "$basedir/node$exe" --expose_gc "$basedir/from.env.args" $args'+
'\n $ret=$LASTEXITCODE'+
'\n} else {'+
'\n & "node$exe" --expose_gc "$basedir/from.env.args" $args'+
'\n $ret=$LASTEXITCODE'+
'\n}'+
'\nexit $ret'+
'\n')
t.end()
})
})
Expand All @@ -104,6 +159,7 @@ test('explicit shebang', function (t) {
throw er
console.error('%j', fs.readFileSync(to, 'utf8'))
console.error('%j', fs.readFileSync(to + '.cmd', 'utf8'))
console.error('%j', fs.readFileSync(to + '.ps1', 'utf8'))

t.equal(fs.readFileSync(to, 'utf8'),
"#!/bin/sh" +
Expand Down Expand Up @@ -131,6 +187,27 @@ test('explicit shebang', function (t) {
"\n @SET PATHEXT=%PATHEXT:;.JS;=;%\r"+
"\n /usr/bin/sh \"%~dp0\\from.sh\" %*\r" +
"\n)")

t.equal(fs.readFileSync(to + '.ps1', 'utf8'),
'#!/usr/bin/env pwsh'+
'\n$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent'+
'\n'+
'\n$exe=""'+
'\nif ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {'+
'\n # Fix case when both the Windows and Linux builds of Node'+
'\n # are installed in the same directory'+
'\n $exe=".exe"'+
'\n}'+
'\n$ret=0'+
'\nif (Test-Path "$basedir//usr/bin/sh$exe") {'+
'\n & "$basedir//usr/bin/sh$exe" "$basedir/from.sh" $args'+
'\n $ret=$LASTEXITCODE'+
'\n} else {'+
'\n & "/usr/bin/sh$exe" "$basedir/from.sh" $args'+
'\n $ret=$LASTEXITCODE'+
'\n}'+
'\nexit $ret'+
'\n')
t.end()
})
})
Expand All @@ -143,6 +220,7 @@ test('explicit shebang with args', function (t) {
throw er
console.error('%j', fs.readFileSync(to, 'utf8'))
console.error('%j', fs.readFileSync(to + '.cmd', 'utf8'))
console.error('%j', fs.readFileSync(to + '.ps1', 'utf8'))

t.equal(fs.readFileSync(to, 'utf8'),
"#!/bin/sh" +
Expand Down Expand Up @@ -170,6 +248,27 @@ test('explicit shebang with args', function (t) {
"\n @SET PATHEXT=%PATHEXT:;.JS;=;%\r"+
"\n /usr/bin/sh -x \"%~dp0\\from.sh.args\" %*\r" +
"\n)")

t.equal(fs.readFileSync(to + '.ps1', 'utf8'),
'#!/usr/bin/env pwsh'+
'\n$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent'+
'\n'+
'\n$exe=""'+
'\nif ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {'+
'\n # Fix case when both the Windows and Linux builds of Node'+
'\n # are installed in the same directory'+
'\n $exe=".exe"'+
'\n}'+
'\n$ret=0'+
'\nif (Test-Path "$basedir//usr/bin/sh$exe") {'+
'\n & "$basedir//usr/bin/sh$exe" -x "$basedir/from.sh.args" $args'+
'\n $ret=$LASTEXITCODE'+
'\n} else {'+
'\n & "/usr/bin/sh$exe" -x "$basedir/from.sh.args" $args'+
'\n $ret=$LASTEXITCODE'+
'\n}'+
'\nexit $ret'+
'\n')
t.end()
})
})