julien
645f81a443
## Summary Fix the dev-VM bootstrap so `node` and `pnpm` are on `PATH` in zsh sessions. On a fresh VM provisioned with `docs/setup/scripts/`, a freshly-cloned checkout fails to run anything (`command not found: pnpm`, and `node` too) because the nvm init never reaches the interactive shell. ## Root cause Two setup scripts interact badly: - `20-zsh.sh` patches `~/.bashrc` with an `exec zsh -l` hand-off on interactive shells (chsh is blocked on the corp VM, so this is how zsh becomes the effective shell), and patches `~/.zshrc` with theme/plugins/fzf only. - `40-node.sh` runs the upstream nvm installer, which appends its init block to **`~/.bashrc`** (its default target). Because `20-zsh.sh` runs first, the `exec zsh -l` guard sits **above** the nvm block in `~/.bashrc`. On every interactive shell, bash execs into zsh before reaching the nvm block — so it never runs — and `~/.zshrc` has no nvm init at all. Net result: zsh sessions have neither `node` nor `pnpm` on `PATH`, even though nvm + Node + corepack installed correctly. This is a procedure bug, not a one-off: every VM built from these scripts hits it. ## Fix `40-node.sh` now mirrors the nvm init block into `~/.zshrc` after enabling corepack — idempotent via a managed marker, same pattern `20-zsh.sh` already uses for its `~/.bashrc` patch: ```sh # Managed by docs/setup/scripts/40-node.sh — nvm init for zsh. export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" ``` `docs/setup/01-dev-debian-vm-setup.md` — the `40-node.sh` row in the bootstrap table now notes the `~/.zshrc` patch and why it is needed. ## What lands | File | Change | | --- | --- | | `docs/setup/scripts/40-node.sh` | Append an idempotent nvm-init block to `~/.zshrc` after corepack enable. | | `docs/setup/01-dev-debian-vm-setup.md` | Document the `~/.zshrc` nvm patch in the `40-node.sh` table row. | ## Manual remediation for already-provisioned VMs VMs built before this fix won't be retroactively patched (the scripts are idempotent and skip already-installed nvm). On those, run once: ```sh cat >> ~/.zshrc <<'EOF' # nvm export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" EOF exec zsh -l ``` (Or re-run `40-node.sh` once this lands — the marker check makes it safe; it will add the block and skip the rest.) ## Test plan - [x] `bash -n docs/setup/scripts/40-node.sh` — syntax valid. - [x] Manual remediation block verified on the affected VM: after appending + `exec zsh -l`, `node --version` (v24) and `pnpm --version` (10.34.1) both resolve. - [ ] Next fresh VM bootstrap: `node` + `pnpm` resolve in the first zsh session with no manual step. - [ ] Re-running `40-node.sh` on an already-set-up VM is a no-op on the nvm install and adds the `~/.zshrc` block exactly once (marker idempotency). ## Related - `docs/setup/01-dev-debian-vm-setup.md` — dev-VM bootstrap procedure. - `20-zsh.sh` — owns the `.bashrc` → zsh hand-off this fix complements. --------- Co-authored-by: Julien Gautier <julien.gautier@apf.asso.fr> Reviewed-on: #255
80 lines
2.6 KiB
Bash
Executable File
80 lines
2.6 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# nvm + Node from the repo's .nvmrc + corepack + pnpm at the version pinned
|
|
# in package.json's packageManager field.
|
|
set -euo pipefail
|
|
# shellcheck source=./lib.sh
|
|
source "$(cd "$(dirname "$0")" && pwd)/lib.sh"
|
|
require_debian
|
|
require_not_root
|
|
|
|
NVM_VERSION="v0.40.1"
|
|
NVM_DIR="$HOME/.nvm"
|
|
|
|
if [[ -d "$NVM_DIR" ]]; then
|
|
skip "nvm already installed at $NVM_DIR."
|
|
else
|
|
log "Installing nvm $NVM_VERSION."
|
|
curl -fsSL "https://raw.githubusercontent.com/nvm-sh/nvm/$NVM_VERSION/install.sh" | bash
|
|
ok "nvm installed."
|
|
fi
|
|
|
|
# Source nvm so we can use it in this shell.
|
|
export NVM_DIR
|
|
# shellcheck disable=SC1091
|
|
source "$NVM_DIR/nvm.sh"
|
|
|
|
# Read .nvmrc from the repo root.
|
|
REPO_ROOT="$(git rev-parse --show-toplevel 2>/dev/null || true)"
|
|
if [[ -z "$REPO_ROOT" ]]; then
|
|
err "Run from inside a git checkout of apf_portal (no repo root found)."
|
|
exit 1
|
|
fi
|
|
if [[ ! -f "$REPO_ROOT/.nvmrc" ]]; then
|
|
warn "$REPO_ROOT/.nvmrc not found — installing Node LTS as fallback."
|
|
nvm install --lts
|
|
nvm alias default 'lts/*'
|
|
else
|
|
NODE_VER="$(<"$REPO_ROOT/.nvmrc")"
|
|
log "Installing Node $NODE_VER (from $REPO_ROOT/.nvmrc)."
|
|
nvm install "$NODE_VER"
|
|
nvm alias default "$NODE_VER"
|
|
ok "Node $(node --version) active."
|
|
fi
|
|
|
|
# corepack — provides pnpm + yarn shims, reads packageManager from package.json.
|
|
corepack enable
|
|
ok "corepack enabled."
|
|
|
|
# Warm pnpm to download the pinned version.
|
|
if [[ -f "$REPO_ROOT/package.json" ]]; then
|
|
pushd "$REPO_ROOT" >/dev/null
|
|
pnpm --version >/dev/null
|
|
ok "pnpm $(pnpm --version) ready (from package.json packageManager)."
|
|
popd >/dev/null
|
|
fi
|
|
|
|
# The nvm installer appends its init to ~/.bashrc only. But the
|
|
# interactive shell on this VM is zsh: 20-zsh.sh hands off via
|
|
# `exec zsh -l` (chsh is blocked on the corp VM). That hand-off execs
|
|
# zsh *before* the nvm block in ~/.bashrc runs, and the nvm installer
|
|
# leaves ~/.zshrc untouched — so without this, zsh sessions have
|
|
# neither node nor pnpm on PATH. Mirror the nvm init into ~/.zshrc
|
|
# (idempotent via marker, same pattern as 20-zsh.sh's .bashrc patch).
|
|
ZSHRC="$HOME/.zshrc"
|
|
[[ -f "$ZSHRC" ]] || touch "$ZSHRC"
|
|
NVM_MARKER='# Managed by docs/setup/scripts/40-node.sh — nvm init for zsh.'
|
|
if grep -qF "$NVM_MARKER" "$ZSHRC"; then
|
|
skip "nvm init already in $ZSHRC."
|
|
else
|
|
cat >> "$ZSHRC" <<'EOF'
|
|
|
|
# Managed by docs/setup/scripts/40-node.sh — nvm init for zsh.
|
|
export NVM_DIR="$HOME/.nvm"
|
|
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
|
|
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
|
|
EOF
|
|
ok "Patched $ZSHRC with nvm init."
|
|
fi
|
|
|
|
log "Reload your shell (exec zsh -l) so nvm + node + pnpm are on PATH."
|