Skip to content

fix: gate cmd switch escaping to MSYS #58

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

Merged
zkochan merged 1 commit into from
Jun 15, 2026
Merged

fix: gate cmd switch escaping to MSYS #58

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 42 additions & 30 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,18 +446,9 @@ function generateShShim (src: string, to: string, opts: InternalOptions): string
shTarget = shTarget.split('\\').join('/')
const quotedPathToTarget = path.isAbsolute(shTarget) ? `"${shTarget}"` : `"$basedir/${shTarget}"`
const quotedPathToTarget_win = path.isAbsolute(shTarget) ? `"${shTarget}"` : `"$basedir_win/${shTarget}"`
let shTarget_win
// For `.cmd`/`.bat` targets the runtime is `cmd` and args is `/C`. When
// Git Bash / MSYS launches a native Win32 process, arguments that look
// like POSIX paths are translated — a bare `/C` becomes `C:\`, which
// drops the switch and leaves cmd.exe running interactively. Prefixing
// with `//` is the MSYS escape: it survives the translation and reaches
// cmd.exe as `/C`. Scoped to the cmd runtime so shebang-derived `/C`
// args on other shims are passed through unchanged.
let shTarget_win = ''
let args = opts.args || ''
if (opts.prog === 'cmd' || opts.prog === 'cmd.exe') {
args = escapeMsysCmdSwitches(args)
}
const isCmdRuntime = opts.prog === 'cmd' || opts.prog === 'cmd.exe'
const shNodePath = normalizePathEnvVar(opts.nodePath).posix
if (!shProg) {
shProg = quotedPathToTarget
Expand All @@ -481,14 +472,15 @@ function generateShShim (src: string, to: string, opts: InternalOptions): string
// basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
// basedir_win="$basedir"
// exe=""
// msys=""
//
// case `uname -a` in
// *CYGWIN*|*MINGW*|*MSYS*)
// if command -v cygpath > /dev/null 2>&1; then
// basedir=`cygpath -w "$basedir"`
// basedir_win="$basedir"
// basedir_win=`cygpath -w "$basedir"`
// fi
// exe=".exe"
// msys="true"
// ;;
// *WSL2*)
// if command -v wslpath > /dev/null 2>&1; then
Expand Down Expand Up @@ -521,14 +513,15 @@ function generateShShim (src: string, to: string, opts: InternalOptions): string
basedir=$(dirname "$(echo "$0" | sed -e 's,\\\\,/,g')")
basedir_win="$basedir"
exe=""
msys=""

case \`uname -a\` in
*CYGWIN*|*MINGW*|*MSYS*)
if command -v cygpath > /dev/null 2>&1; then
basedir=\`cygpath -w "$basedir"\`
basedir_win="$basedir"
basedir_win=\`cygpath -w "$basedir"\`
fi
exe=".exe"
msys="true"
;;
*WSL2*)
if command -v wslpath > /dev/null 2>&1; then
Expand Down Expand Up @@ -558,35 +551,50 @@ fi
`
}

if (shLongProg) {
if (shProgHasExe) {
sh += `\
const generateExecBlock = (execArgs: string) => {
if (shLongProg) {
if (shProgHasExe) {
return `\
if [ -x ${shLongProgExe} ]; then
exec ${shLongProgExe} ${args} ${shTarget_win} ${progArgs}"$@"
exec ${shLongProgExe} ${execArgs} ${shTarget_win} ${progArgs}"$@"
else
exec ${shProgExe} ${args} ${shTarget_win} ${progArgs}"$@"
exec ${shProgExe} ${execArgs} ${shTarget_win} ${progArgs}"$@"
fi
`
} else {
sh += `\
} else {
return `\
if [ -n "$exe" ] && [ -x ${shLongProgExe} ]; then
exec ${shLongProgExe} ${args} ${shTarget_win} ${progArgs}"$@"
exec ${shLongProgExe} ${execArgs} ${shTarget_win} ${progArgs}"$@"
elif [ -x ${shLongProg} ]; then
exec ${shLongProg} ${args} ${shTarget} ${progArgs}"$@"
exec ${shLongProg} ${execArgs} ${shTarget} ${progArgs}"$@"
elif command -v ${shProg} >/dev/null 2>&1; then
exec ${shProg} ${args} ${shTarget} ${progArgs}"$@"
exec ${shProg} ${execArgs} ${shTarget} ${progArgs}"$@"
elif [ -n "$exe" ] && command -v ${shProgExe} >/dev/null 2>&1; then
exec ${shProgExe} ${args} ${shTarget_win} ${progArgs}"$@"
exec ${shProgExe} ${execArgs} ${shTarget_win} ${progArgs}"$@"
else
exec ${shProg} ${args} ${shTarget} ${progArgs}"$@"
exec ${shProg} ${execArgs} ${shTarget} ${progArgs}"$@"
fi
`
}
} else {
return `\
exec ${shProg} ${execArgs} ${shTarget} ${progArgs}"$@"
exit $?
`
}
} else {
}

const msysArgs = isCmdRuntime ? escapeMsysCmdSwitches(args) : args
if (msysArgs !== args) {
sh += `\
exec ${shProg} ${args} ${shTarget} ${progArgs}"$@"
exit $?
if [ -n "$msys" ]; then
${indentShellBlock(generateExecBlock(msysArgs))}
else
${indentShellBlock(generateExecBlock(args))}
fi
`
} else {
sh += generateExecBlock(args)
}

// Marker used by consumers to detect whether the shim is up-to-date
Expand All @@ -596,6 +604,10 @@ exit $?
return sh
}

function indentShellBlock (script: string): string {
return script.split('\n').map(line => line ? ` ${line}` : line).join('\n')
}

/**
* Generate the content of a shim for PowerShell.
*
Expand Down
5 changes: 3 additions & 2 deletions test/e2e.test.js.snapshot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ exports[`create a command shim for a .exe file > shim files 1`] = `
basedir=$(dirname "$(echo "$0" | sed -e 's,\\\\,/,g')")
basedir_win="$basedir"
exe=""
msys=""

case \`uname -a\` in
*CYGWIN*|*MINGW*|*MSYS*)
if command -v cygpath > /dev/null 2>&1; then
basedir=\`cygpath -w "$basedir"\`
basedir_win="$basedir"
basedir_win=\`cygpath -w "$basedir"\`
fi
exe=".exe"
msys="true"
;;
*WSL2*)
if command -v wslpath > /dev/null 2>&1; then
Expand Down
Loading
Loading