Update tools.func
This commit is contained in:
parent
c9a5b893db
commit
b0610bd8a8
@ -3286,6 +3286,9 @@ function setup_nodejs() {
|
|||||||
local NODE_VERSION="${NODE_VERSION:-22}"
|
local NODE_VERSION="${NODE_VERSION:-22}"
|
||||||
local NODE_MODULE="${NODE_MODULE:-}"
|
local NODE_MODULE="${NODE_MODULE:-}"
|
||||||
|
|
||||||
|
# ALWAYS clean up legacy installations first (nvm, etc.) to prevent conflicts
|
||||||
|
cleanup_legacy_install "nodejs"
|
||||||
|
|
||||||
# Get currently installed version
|
# Get currently installed version
|
||||||
local CURRENT_NODE_VERSION=""
|
local CURRENT_NODE_VERSION=""
|
||||||
CURRENT_NODE_VERSION=$(is_tool_installed "nodejs" 2>/dev/null) || true
|
CURRENT_NODE_VERSION=$(is_tool_installed "nodejs" 2>/dev/null) || true
|
||||||
@ -3319,9 +3322,6 @@ function setup_nodejs() {
|
|||||||
msg_info "Setup Node.js $NODE_VERSION"
|
msg_info "Setup Node.js $NODE_VERSION"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Clean up legacy installations (nvm, etc.)
|
|
||||||
cleanup_legacy_install "nodejs"
|
|
||||||
|
|
||||||
# Remove ALL Debian nodejs packages BEFORE adding NodeSource repo
|
# Remove ALL Debian nodejs packages BEFORE adding NodeSource repo
|
||||||
if dpkg -l 2>/dev/null | grep -qE "^ii.*(nodejs|libnode|node-cjs|node-acorn|node-balanced|node-brace|node-minimatch|node-undici|node-xtend|node-corepack)"; then
|
if dpkg -l 2>/dev/null | grep -qE "^ii.*(nodejs|libnode|node-cjs|node-acorn|node-balanced|node-brace|node-minimatch|node-undici|node-xtend|node-corepack)"; then
|
||||||
msg_info "Removing Debian-packaged Node.js and dependencies"
|
msg_info "Removing Debian-packaged Node.js and dependencies"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user