restore ensure_profile_loaded to core.func
This commit is contained in:
parent
7a52d54ab3
commit
63734bd544
@ -126,6 +126,34 @@ icons() {
|
|||||||
HOURGLASS="${TAB}⏳${TAB}"
|
HOURGLASS="${TAB}⏳${TAB}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# ------------------------------------------------------------------------------
|
||||||
|
# ensure_profile_loaded()
|
||||||
|
#
|
||||||
|
# - Sources /etc/profile.d/*.sh scripts if not already loaded
|
||||||
|
# - Fixes PATH issues when running via pct enter/exec (non-login shells)
|
||||||
|
# - Safe to call multiple times (uses guard variable)
|
||||||
|
# - Should be called in update_script() or any script running inside LXC
|
||||||
|
# ------------------------------------------------------------------------------
|
||||||
|
ensure_profile_loaded() {
|
||||||
|
# Skip if already loaded or running on Proxmox host
|
||||||
|
[[ -n "${_PROFILE_LOADED:-}" ]] && return
|
||||||
|
command -v pveversion &>/dev/null && return
|
||||||
|
|
||||||
|
# Source all profile.d scripts to ensure PATH is complete
|
||||||
|
if [[ -d /etc/profile.d ]]; then
|
||||||
|
for script in /etc/profile.d/*.sh; do
|
||||||
|
[[ -r "$script" ]] && source "$script"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Also ensure /usr/local/bin is in PATH (common install location)
|
||||||
|
if [[ ":$PATH:" != *":/usr/local/bin:"* ]]; then
|
||||||
|
export PATH="/usr/local/bin:$PATH"
|
||||||
|
fi
|
||||||
|
|
||||||
|
export _PROFILE_LOADED=1
|
||||||
|
}
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
# default_vars()
|
# default_vars()
|
||||||
#
|
#
|
||||||
@ -838,7 +866,7 @@ cleanup_lxc() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Node.js npm
|
# Node.js npm
|
||||||
if command -v npm &>/dev/null; then
|
if command -v npm &>/dev/null; then
|
||||||
rm -rf /root/.npm/_cacache /root/.npm/_logs 2>/dev/null || true
|
rm -rf /root/.npm/_cacache /root/.npm/_logs 2>/dev/null || true
|
||||||
fi
|
fi
|
||||||
# Node.js yarn
|
# Node.js yarn
|
||||||
@ -969,7 +997,6 @@ function get_lxc_ip() {
|
|||||||
export LOCAL_IP
|
export LOCAL_IP
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
# SIGNAL TRAPS
|
# SIGNAL TRAPS
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user