Malin
60cdd60327
The real issue: PKG_EXECPATH inherited from parent makes pkg bootstrap treat argv[1] as a module path regardless of arg order. Fix: unset only PKG_EXECPATH (env -u) so bootstrap starts fresh and loads embedded main. Strip --install-missing-components since it's not a commander.js flag. Keep all other env vars for auth/session. Parent handles actual connection after child exits. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
55 lines
1.8 KiB
Bash
55 lines
1.8 KiB
Bash
#!/bin/bash
|
|
# sudo-wrapper.sh
|
|
#
|
|
# purevpn-cli calls: sudo purevpn-cli --connect <loc> --install-missing-components
|
|
#
|
|
# Problem: PKG_EXECPATH inherited from the parent makes the pkg bootstrap treat
|
|
# argv[1] as a module path → "Cannot find module '/--connect'" (or '/--install...')
|
|
# regardless of arg order.
|
|
#
|
|
# Solution:
|
|
# 1. Strip --install-missing-components (not a commander.js flag; causes errors)
|
|
# 2. Unset PKG_EXECPATH only (-u) so the child's bootstrap starts fresh and
|
|
# loads the embedded main module. All other env vars (auth, session) are kept.
|
|
# 3. Depth guard prevents infinite recursion if the child also tries to sudo.
|
|
|
|
DEPTH="${PUREVPN_SUDO_DEPTH:-0}"
|
|
if [[ "$DEPTH" -ge 2 ]]; then
|
|
echo "[sudo-wrapper] recursion depth $DEPTH — exiting 0" >&2
|
|
exit 0
|
|
fi
|
|
NEXT_DEPTH=$(( DEPTH + 1 ))
|
|
|
|
binary=""
|
|
has_install_flag=false
|
|
other_args=()
|
|
|
|
for a in "$@"; do
|
|
case "$a" in
|
|
-E|-n|-H|--preserve-env|--non-interactive) continue ;; # sudo flags, skip
|
|
--install-missing-components) has_install_flag=true ;; # strip, don't pass
|
|
*)
|
|
if [[ -z "$binary" ]]; then
|
|
binary="$a"
|
|
else
|
|
other_args+=("$a")
|
|
fi
|
|
;;
|
|
esac
|
|
done
|
|
|
|
if [[ -z "$binary" ]]; then
|
|
echo "[sudo-wrapper] no binary supplied" >&2
|
|
exit 1
|
|
fi
|
|
|
|
if [[ "$has_install_flag" == "true" ]]; then
|
|
echo "[sudo-wrapper] stripped --install-missing-components, unset PKG_EXECPATH (depth=$NEXT_DEPTH): $binary ${other_args[*]}" >&2
|
|
exec env -u PKG_EXECPATH PUREVPN_SUDO_DEPTH="$NEXT_DEPTH" \
|
|
"$binary" "${other_args[@]}"
|
|
else
|
|
echo "[sudo-wrapper] passthrough (depth=$NEXT_DEPTH): $binary ${other_args[*]}" >&2
|
|
exec env PUREVPN_SUDO_DEPTH="$NEXT_DEPTH" \
|
|
"$binary" "${other_args[@]}"
|
|
fi
|