KrustyPlanet/hermes-agent
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(install): repair existing managed-Node global prefix on re-run

Browse source 
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:
xxxigm 2026-06-14 17:34:11 +07:00
parent 98205da008
commit 1db8f7ea80
3 changed files with 64 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tests/test_install_sh_node_global_prefix.py
View file

@ -25,15 +25,31 @@ def test_install_sh_redirects_bundled_npm_global_prefix_to_link_dir() -> None:
# The redirect must target the link dir's PARENT so global bins resolve to
# <parent>/bin == the command link dir (node/npm/npx live there and it is
# guaranteed on PATH by the installer's PATH setup).
assert 'printf \'prefix=%s\\n\' "$(dirname "$node_link_dir")" > "$HERMES_HOME/node/etc/npmrc"' in text
assert "configure_managed_node_npm_prefix()" in text
assert 'printf \'prefix=%s\\n\' "$(dirname "$link_dir")" > "$HERMES_HOME/node/etc/npmrc"' in text
# The npmrc lives under the bundled Node so it only affects this npm, not
# the user's other Node installs or their ~/.npmrc.
assert '"$HERMES_HOME/node/etc/npmrc"' in text
def test_install_sh_repairs_existing_managed_node_on_rerun() -> None:
"""The redirect must run on every install (not just fresh Node installs),
so re-running the installer repairs pre-existing managed installs whose
Node is already up to date and would otherwise skip install_node."""
text = INSTALL_SH.read_text()
check_node_body = text.split("check_node()", 1)[1].split("\ninstall_node()", 1)[0]
assert "configure_managed_node_npm_prefix" in check_node_body
# No-op guard so it's safe to call when there is no managed Node.
assert '[ -x "$HERMES_HOME/node/bin/npm" ] || return 0' in text
def test_node_bootstrap_redirects_bundled_npm_global_prefix_to_link_dir() -> None:
text = NODE_BOOTSTRAP.read_text()
assert "_nb_configure_npm_prefix()" in text
assert 'printf \'prefix=%s\\n\' "$(dirname "$_link_dir")" > "$HERMES_HOME/node/etc/npmrc"' in text
assert '"$HERMES_HOME/node/etc/npmrc"' in text
# Runs at the top of ensure_node so existing managed installs are repaired
# even when a modern Node is already present (early return path).
ensure_node_body = text.split("ensure_node()", 1)[1]
assert "_nb_configure_npm_prefix" in ensure_node_body
assert '[ -x "$HERMES_HOME/node/bin/npm" ] || return 0' in text