mshillam
/
nvm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge 1ed90f91f1 into 1ba8a96ec9

This commit is contained in:
tudorilisoi 2016-01-03 09:35:50 +00:00
parent 1ba8a96ec9 1ed90f91f1
commit d046935843
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
nvm.sh
View File

@ -1340,9 +1340,9 @@ nvm_npm_global_modules() {
local VERSION local VERSION
VERSION="$1" VERSION="$1"
if [ "_$VERSION" = "_system" ]; then if [ "_$VERSION" = "_system" ]; then
NPMLIST=$(nvm use system > /dev/null && npm list -g --depth=0 2> /dev/null | command tail -n +2) NPMLIST=$(nvm use system > /dev/null && npm list -g --depth=0 2> /dev/null |grep -e '^.── '|awk -F '── ' '{print $2}' | command tail -n +2)
else else
NPMLIST=$(nvm use "$VERSION" > /dev/null && npm list -g --depth=0 2> /dev/null | command tail -n +2) NPMLIST=$(nvm use "$VERSION" > /dev/null && npm list -g --depth=0 2> /dev/null |grep -e '^.── '|awk -F '── ' '{print $2}' | command tail -n +2)
fi fi
local INSTALLS local INSTALLS
@ -1546,7 +1546,6 @@ nvm() {
"debug" ) "debug" )
local ZHS_HAS_SHWORDSPLIT_UNSET local ZHS_HAS_SHWORDSPLIT_UNSET
ZHS_HAS_SHWORDSPLIT_UNSET=1
if nvm_has "setopt"; then if nvm_has "setopt"; then
ZHS_HAS_SHWORDSPLIT_UNSET=$(setopt | command grep shwordsplit > /dev/null ; echo $?) ZHS_HAS_SHWORDSPLIT_UNSET=$(setopt | command grep shwordsplit > /dev/null ; echo $?)
setopt shwordsplit setopt shwordsplit
@ -2264,19 +2263,27 @@ $NVM_LS_REMOTE_POST_MERGED_OUTPUT" | command grep -v "N/A" | command sed '/^$/d'
INSTALLS="${NPMLIST%% //// *}" INSTALLS="${NPMLIST%% //// *}"
LINKS="${NPMLIST##* //// }" LINKS="${NPMLIST##* //// }"
#used to check if install lists are empty
local whitespace
whitespace=$(printf '\n\t ')
echo "Reinstalling global packages from $VERSION..." echo "Reinstalling global packages from $VERSION..."
echo "$INSTALLS" | command xargs npm install -g --quiet case "$INSTALLS" in
*[!$whitespace]*) echo "$INSTALLS" | command xargs npm install -g --quiet;;
*) echo "No global packages to install.";;
esac
echo "Linking global packages from $VERSION..." echo "Linking global packages from $VERSION..."
set -f; IFS=' case "$LINKS" in
' # necessary to turn off variable expansion except for newlines *[!$whitespace]*)
for LINK in $LINKS; do for LINK in $LINKS; do
set +f; unset IFS # restore variable expansion if [ -n "$LINK" ]; then
if [ -n "$LINK" ]; then (cd "$LINK" && npm link)
(cd "$LINK" && npm link) fi
fi done
done ;;
set +f; unset IFS # restore variable expansion in case $LINKS was empty *) echo "No global packages to link.";;
esac
;; ;;
"clear-cache" ) "clear-cache" )
command rm -f "$NVM_DIR/v*" "$(nvm_version_dir)" 2>/dev/null command rm -f "$NVM_DIR/v*" "$(nvm_version_dir)" 2>/dev/null