paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 09:27:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

install: Tell NVM to not change $PATH earlier.

Browse Source 
This removes a possible window where an installer error could leave
`nvm` in a state where it had prepended the full path to the
newly-installed `npm` to `$PATH`; we would like to avoid `nvm`
fiddling with path whenever possible (ref ebe930ab2c).
This commit is contained in:
Alex Vandiver
2021-05-11 20:52:56 +00:00
committed by Alex Vandiver
parent 23b544d613
commit 3ccb77da74
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/lib/install-node
View File

@@ -45,6 +45,10 @@ if [ "$current_node_version" != "v$node_version" ] || ! [ -L "$node_wrapper_path
. "$NVM_DIR/nvm.sh" . "$NVM_DIR/nvm.sh"
fi fi
# Tell NVM that we don't want it messing around with $PATH; we'll
# adjust which npm to use by symlinks below.
nvm alias default system
nvm install "$node_version" nvm install "$node_version"
NODE_BIN="$(nvm which $node_version)" NODE_BIN="$(nvm which $node_version)"
@@ -57,12 +61,6 @@ if [ "$current_node_version" != "v$node_version" ] || ! [ -L "$node_wrapper_path
ln -nsf "$NODE_BIN" /usr/local/bin/node ln -nsf "$NODE_BIN" /usr/local/bin/node
ln -nsf "$(dirname "$NODE_BIN")/npm" /usr/local/bin/npm ln -nsf "$(dirname "$NODE_BIN")/npm" /usr/local/bin/npm
ln -nsf "$(dirname "$NODE_BIN")/npx" /usr/local/bin/npx ln -nsf "$(dirname "$NODE_BIN")/npx" /usr/local/bin/npx
# Tell NVM that we don't want it messing around with $PATH, which
# can get us into trouble, if we've just upgraded but our parent
# env still has the old version first in its PATH. Tell it to use
# the newly-symlinked one that it will find in /usr/local/bin
nvm alias default system
fi fi
# Work around the fact that apparently sudo doesn't clear the HOME # Work around the fact that apparently sudo doesn't clear the HOME