ewilliams28/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-08-12 21:53:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(installer): promote persisted PATH entries

Browse Source
This commit is contained in:
Peter Steinberger
2026-05-10 05:39:42 +01:00
parent 91522b5534
commit 549693ffcb
2 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/install.sh
+5 -22
View File
@@ -1372,15 +1372,16 @@ persist_shell_path_prepend() {
return 1
fi
local path_line="export PATH=\"${dir}:\$PATH\""
local path_expr="${2:-$dir}"
local path_line="export PATH=\"${path_expr}:\$PATH\""
local wrote_rc=0
for rc in "$HOME/.bashrc" "$HOME/.zshrc"; do
if [[ -f "$rc" ]]; then
if ! grep -Fq "$dir" "$rc"; then
if [[ "$(sed -n '1p' "$rc")" != "$path_line" ]]; then
local tmp_rc="${rc}.openclaw-tmp"
{
printf '%s\n' "$path_line"
cat "$rc"
grep -Fvx "$path_line" "$rc" || true
} > "$tmp_rc"
mv "$tmp_rc" "$rc"
fi
@@ -1761,25 +1762,7 @@ fix_npm_permissions() {
npm config set prefix "$HOME/.npm-global"
ui_warn "Avoid sudo npm i -g for future OpenClaw updates; use npm i -g openclaw@latest so npm keeps using this user prefix instead of a different global prefix."
# shellcheck disable=SC2016
local path_line='export PATH="$HOME/.npm-global/bin:$PATH"'
local wrote_rc=0
for rc in "$HOME/.bashrc" "$HOME/.zshrc"; do
if [[ -f "$rc" ]]; then
if ! grep -q ".npm-global" "$rc"; then
local tmp_rc="${rc}.openclaw-tmp"
{
printf '%s\n' "$path_line"
cat "$rc"
} > "$tmp_rc"
mv "$tmp_rc" "$rc"
fi
wrote_rc=1
fi
done
if [[ "$wrote_rc" -eq 0 ]]; then
printf '%s\n' "$path_line" >> "$HOME/.bashrc"
fi
persist_shell_path_prepend "$HOME/.npm-global/bin" '$HOME/.npm-global/bin' || true
export PATH="$HOME/.npm-global/bin:$PATH"
ui_success "npm configured for user installs"
test/scripts/install-sh.test.ts
+16 -2
View File
@@ -168,7 +168,14 @@ describe("install.sh", () => {
const installedNode = join(installedBin, "node");
writeFileSync(
join(home, ".bashrc"),
["case $- in", " *i*) ;;", " *) return ;;", "esac", ""].join("\n"),
[
"case $- in",
" *i*) ;;",
" *) return ;;",
"esac",
`export PATH="${installedBin}:$PATH"`,
"",
].join("\n"),
);
writeFileSync(
oldNode,
@@ -272,7 +279,14 @@ describe("install.sh", () => {
mkdirSync(home, { recursive: true });
writeFileSync(
join(home, ".bashrc"),
["case $- in", " *i*) ;;", " *) return ;;", "esac", ""].join("\n"),
[
"case $- in",
" *i*) ;;",
" *) return ;;",
"esac",
'export PATH="$HOME/.npm-global/bin:$PATH"',
"",
].join("\n"),
);
let result: ReturnType<typeof runInstallShell> | undefined;