mirror of
https://github.com/openclaw/openclaw.git
synced 2026-02-09 05:19:32 +08:00
Merge pull request #1297 from ysqander/fix/fish-shell-bash
exec: prefer bash when fish is default shell
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
import fs from "node:fs";
|
||||
import path from "node:path";
|
||||
import { spawn } from "node:child_process";
|
||||
import path from "node:path";
|
||||
|
||||
function resolvePowerShellPath(): string {
|
||||
const systemRoot = process.env.SystemRoot || process.env.WINDIR;
|
||||
@@ -30,7 +31,13 @@ export function getShellConfig(): { shell: string; args: string[] } {
|
||||
};
|
||||
}
|
||||
|
||||
const shell = process.env.SHELL?.trim() || "sh";
|
||||
const envShell = process.env.SHELL?.trim();
|
||||
const shellName = envShell ? path.basename(envShell) : "";
|
||||
// Fish rejects common bashisms used by tools, so prefer bash when detected.
|
||||
if (shellName === "fish") {
|
||||
return { shell: "/bin/bash", args: ["-c"] };
|
||||
}
|
||||
const shell = envShell || "sh";
|
||||
return { shell, args: ["-c"] };
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user