Skip to content

fix: support windows cmd shims in fork mode #6060

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

Open
UrielAbel wants to merge 1 commit into
base: development
Choose a base branch
from
Open

fix: support windows cmd shims in fork mode #6060

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
19 changes: 19 additions & 0 deletions lib/API.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,6 +861,25 @@ class API {
Common.err(e.message);
return cb(Common.retErr(e));
}

// Windows shim auto-detection for CLI wrappers (.cmd/.bat)
if (
conf.IS_WINDOWS &&
resolved_paths &&
typeof resolved_paths.pm_exec_path === 'string' &&
/\.(cmd|bat)$/i.test(resolved_paths.pm_exec_path)
) {
const interp = resolved_paths.exec_interpreter;

if (
!interp ||
interp === 'node' ||
interp === process.execPath ||
/node(.exe)?$/i.test(String(interp))
) {
resolved_paths.exec_interpreter = 'none';
}
}

Common.printOut(conf.PREFIX_MSG + 'Starting %s in %s (%d instance' + (resolved_paths.instances > 1 ? 's' : '') + ')',
resolved_paths.pm_exec_path, resolved_paths.exec_mode, resolved_paths.instances);
Expand Down
40 changes: 33 additions & 7 deletions lib/God/ForkMode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,28 @@ module.exports = function ForkMode(God) {
var interpreter = pm2_env.exec_interpreter || process.execPath;
var pidFile = pm2_env.pm_pid_path;

if (interpreter !== 'none') {
var isWindows = process.platform === 'win32';
var execPath = pm2_env.pm_exec_path || '';
var isCmdLike = isWindows && typeof execPath === 'string' && /\.(cmd|bat)$/i.test(execPath);
var isNoInterp = interpreter === 'none';

if (isCmdLike) {
const quote = (s) =>
/[\s"&'`]/.test(s)
? `"${String(s).replace(/"/g, '\\"')}"`
: String(s);

const base = quote(execPath);
let extra = '';

if (pm2_env.args && Array.isArray(pm2_env.args) && pm2_env.args.length > 0) {
extra = ' ' + pm2_env.args.map(a => quote(a)).join(' ');
}

command = base + extra;
args = [];
}
else if (!isNoInterp) {
command = interpreter;

if (pm2_env.node_args && Array.isArray(pm2_env.node_args)) {
Expand All @@ -61,16 +82,21 @@ module.exports = function ForkMode(God) {
else if (interpreter.includes('bun') === true) {
args.push(path.resolve(path.dirname(module.filename), '..', 'ProcessContainerForkBun.js'));
}
else
args.push(pm2_env.pm_exec_path);
else {
args.push(execPath);
}

if (pm2_env.args) {
args = args.concat(pm2_env.args);
}
}
else {
command = pm2_env.pm_exec_path;
command = execPath;
args = [ ];
}

if (pm2_env.args) {
args = args.concat(pm2_env.args);
if (pm2_env.args) {
args = args.concat(pm2_env.args);
}
}

// piping stream o file
Expand Down