mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-06-18 09:51:59 +00:00
fix(install): repair existing managed-Node global prefix on re-run
The initial fix only wrote the prefix npmrc on a fresh Node install, so pre-existing bundled-Node installs (Node already present) were not repaired by re-running the installer — install_node/ensure_node skip when Node is already up to date. Extract the redirect into an idempotent helper (configure_managed_node_npm_prefix / _nb_configure_npm_prefix) that no-ops when there's no Hermes-managed npm, and call it unconditionally from check_node (install.sh) and at the top of ensure_node (node-bootstrap.sh). Re-running the install command now repairs an affected install in place, not just brand-new ones.
This commit is contained in:
parent
98205da008
commit
1db8f7ea80
3 changed files with 64 additions and 22 deletions
|
|
@ -57,6 +57,19 @@ _nb_get_link_dir() {
|
|||
fi
|
||||
}
|
||||
|
||||
# Redirect a Hermes-managed Node's `npm install -g` to the command link dir
|
||||
# (already on PATH) instead of the default $HERMES_HOME/node/bin, which is off
|
||||
# PATH and wiped on every Node upgrade. Scoped to the managed Node via its
|
||||
# prefix-local global npmrc; the user's other Node installs / ~/.npmrc are
|
||||
# untouched. Idempotent no-op when there's no managed npm.
|
||||
_nb_configure_npm_prefix() {
|
||||
[ -x "$HERMES_HOME/node/bin/npm" ] || return 0
|
||||
local _link_dir
|
||||
_link_dir="$(_nb_get_link_dir)"
|
||||
mkdir -p "$HERMES_HOME/node/etc"
|
||||
printf 'prefix=%s\n' "$(dirname "$_link_dir")" > "$HERMES_HOME/node/etc/npmrc"
|
||||
}
|
||||
|
||||
_nb_node_major() {
|
||||
local v
|
||||
v=$(node --version 2>/dev/null | sed 's/^v//' | cut -d. -f1)
|
||||
|
|
@ -207,12 +220,7 @@ _nb_install_bundled_node() {
|
|||
ln -sf "$HERMES_HOME/node/bin/npm" "$_link_dir/npm"
|
||||
ln -sf "$HERMES_HOME/node/bin/npx" "$_link_dir/npx"
|
||||
|
||||
# Redirect this Node's `npm install -g` to the link dir (already on PATH)
|
||||
# instead of the default $HERMES_HOME/node/bin, which is off PATH and wiped
|
||||
# on every Node upgrade. Scoped to this Node via its prefix-local global
|
||||
# npmrc; the user's other Node installs / ~/.npmrc are untouched.
|
||||
mkdir -p "$HERMES_HOME/node/etc"
|
||||
printf 'prefix=%s\n' "$(dirname "$_link_dir")" > "$HERMES_HOME/node/etc/npmrc"
|
||||
_nb_configure_npm_prefix
|
||||
|
||||
export PATH="$HERMES_HOME/node/bin:$PATH"
|
||||
|
||||
|
|
@ -228,6 +236,10 @@ _nb_install_bundled_node() {
|
|||
ensure_node() {
|
||||
HERMES_NODE_AVAILABLE=false
|
||||
|
||||
# Repair pre-existing managed installs where `npm install -g` lands off
|
||||
# PATH. No-op when there's no managed Node, so it's safe to run first.
|
||||
_nb_configure_npm_prefix
|
||||
|
||||
if _nb_have_modern_node; then
|
||||
_nb_ok "Node $(node --version) found"
|
||||
HERMES_NODE_AVAILABLE=true
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue