vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-06 16:20:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: cover Windows pnpm and Lobster install regressions

Browse Source
This commit is contained in:
Peter Steinberger
2026-04-26 08:13:58 +01:00
parent 5b9be2cdb1
commit 1de4aff06d
6 changed files with 232 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
scripts/pnpm-runner.mjs
View File

@@ -3,8 +3,16 @@ import { closeSync, openSync, readSync } from "node:fs";
import path from "node:path";
import { buildCmdExeCommandLine } from "./windows-cmd-helpers.mjs";
function getPortableBasename(value) {
return value.split(/[/\\]/).at(-1) ?? value;
}
function getPortableExtension(value) {
return path.posix.extname(getPortableBasename(value)).toLowerCase();
}
function isPnpmExecPath(value) {
return /^pnpm(?:-cli)?(?:\.(?:[cm]?js|cmd|exe))?$/.test(path.basename(value).toLowerCase());
return /^pnpm(?:-cli)?(?:\.(?:[cm]?js|cmd|exe))?$/.test(getPortableBasename(value).toLowerCase());
}
function hasScriptShebang(value) {
@@ -30,7 +38,7 @@ function isNodeRunnablePnpmExecPath(value) {
if (!isPnpmExecPath(value)) {
return false;
}
const extension = path.extname(value).toLowerCase();
const extension = getPortableExtension(value);
if (extension === ".js" || extension === ".cjs" || extension === ".mjs") {
return true;
}
@@ -48,16 +56,31 @@ export function resolvePnpmRunner(params = {}) {
const platform = params.platform ?? process.platform;
const comSpec = params.comSpec ?? process.env.ComSpec ?? "cmd.exe";
if (
typeof npmExecPath === "string" &&
npmExecPath.length > 0 &&
isNodeRunnablePnpmExecPath(npmExecPath)
) {
return {
command: nodeExecPath,
args: [...nodeArgs, npmExecPath, ...pnpmArgs],
shell: false,
};
if (typeof npmExecPath === "string" && npmExecPath.length > 0 && isPnpmExecPath(npmExecPath)) {
if (isNodeRunnablePnpmExecPath(npmExecPath)) {
return {
command: nodeExecPath,
args: [...nodeArgs, npmExecPath, ...pnpmArgs],
shell: false,
};
}
const npmExecExtension = getPortableExtension(npmExecPath);
if (platform === "win32" && npmExecExtension === ".exe") {
return {
command: npmExecPath,
args: pnpmArgs,
shell: false,
};
}
if (platform === "win32" && npmExecExtension === ".cmd") {
return {
command: comSpec,
args: ["/d", "/s", "/c", buildCmdExeCommandLine(npmExecPath, pnpmArgs)],
shell: false,
windowsVerbatimArguments: true,
};
}
}
if (platform === "win32") {