Skip to content

Commit

Permalink
Merge pull request #508 from creationix/nvm_copy_packages_not_npm
Browse files Browse the repository at this point in the history
Don't copy `npm` with `nvm copy-packages`
  • Loading branch information
ljharb committed Sep 3, 2014
2 parents d24dc66 + 214ce88 commit 1c3585e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
8 changes: 3 additions & 5 deletions nvm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -785,15 +785,13 @@ nvm() {
nvm help
return 127
fi
VERSION=$(nvm_version "$2")
local ROOT
ROOT=$(nvm use $VERSION && npm -g root)
VERSION="$(nvm_version "$2")"

# declare local INSTALLS first, otherwise it doesn't work in zsh
local INSTALLS
INSTALLS=$(nvm use $VERSION > /dev/null && npm list --global --parseable --depth=0 2> /dev/null | tail -n +2 | \grep -o -e '/[^/]*$' | cut -c 2- | xargs)
INSTALLS=$(nvm use "$VERSION" > /dev/null && npm list -g --depth=0 | tail -n +2 | \grep -o -e ' [^@]*' | cut -c 2- | \grep -v npm | xargs)

npm install -g --quiet $INSTALLS
echo "$INSTALLS" | xargs npm install -g --quiet
;;
"clear-cache" )
rm -f $NVM_DIR/v* "$(nvm_version_dir)" 2>/dev/null
Expand Down
8 changes: 4 additions & 4 deletions test/slow/nvm copy-packages/should work as expected
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ die () { echo "$@" ; exit 1; }

nvm use 0.10.28

EXPECTED_PACKAGES="autoprefixer bower david eslint grunt-cli grunth-cli http-server jshint marked node-gyp npm recursive-blame uglify-js yo"
EXPECTED_PACKAGES="autoprefixer bower david eslint grunt-cli grunth-cli http-server jshint marked node-gyp recursive-blame uglify-js yo"

npm install -g --quiet $EXPECTED_PACKAGES
echo "$EXPECTED_PACKAGES" | xargs npm install -g --quiet

nvm use 0.10.29
ORIGINAL_PACKAGES=$(npm list --global --parseable --depth=0 2> /dev/null | tail -n +2 | grep -o -e '/[^/]*$' | cut -c 2- | sort | uniq | xargs)
ORIGINAL_PACKAGES=$(npm list -g --depth=0 | tail -n +2 | \grep -o -e ' [^@]*' | cut -c 2- | \grep -v npm | sort | uniq | xargs)

nvm copy-packages 0.10.28
FINAL_PACKAGES=$(npm list --global --parseable --depth=0 2> /dev/null | tail -n +2 | grep -o -e '/[^/]*$' | cut -c 2- | sort | uniq | xargs)
FINAL_PACKAGES=$(npm list -g --depth=0 | tail -n +2 | \grep -o -e ' [^@]*' | cut -c 2- | \grep -v npm | sort | uniq | xargs)

[ "$FINAL_PACKAGES" = "$EXPECTED_PACKAGES" ] || die "final packages ($FINAL_PACKAGES) did not match expected packages ($EXPECTED_PACKAGES)"
[ "$ORIGINAL_PACKAGES" != "$FINAL_PACKAGES" ] || die "original packages matched final packages ($ORIGINAL_PACKAGES)"
Expand Down

0 comments on commit 1c3585e

Please sign in to comment.