Commit 20014650 authored by Hunter Loftis's avatar Hunter Loftis

clearer messaging about installed npm version

parent 8c147cf3
...@@ -111,7 +111,7 @@ if [ "$npm_engine" != "" ]; then ...@@ -111,7 +111,7 @@ if [ "$npm_engine" != "" ]; then
npm_engine=$(curl --silent --get --data-urlencode "range=${npm_engine}" https://semver.herokuapp.com/npm/resolve) npm_engine=$(curl --silent --get --data-urlencode "range=${npm_engine}" https://semver.herokuapp.com/npm/resolve)
fi fi
if [[ `npm --version` == "$npm_engine" ]]; then if [[ `npm --version` == "$npm_engine" ]]; then
info "Version `npm --version` already installed" info "npm `npm --version` already installed with node"
else else
info "Downloading and installing npm $npm_engine (replacing version `npm --version`)..." info "Downloading and installing npm $npm_engine (replacing version `npm --version`)..."
npm install --quiet -g npm@$npm_engine > /dev/null 2>&1 | indent npm install --quiet -g npm@$npm_engine > /dev/null 2>&1 | indent
...@@ -220,7 +220,7 @@ if test -d $build_dir/node_modules; then ...@@ -220,7 +220,7 @@ if test -d $build_dir/node_modules; then
fi fi
# Show the final dependency tree # Show the final dependency tree
info "Build successful!" head "Build successful!"
(npm ls --depth=0 || true) 2>/dev/null | indent (npm ls --depth=0 || true) 2>/dev/null | indent
# Show any relevant warnings # Show any relevant warnings
......
...@@ -56,7 +56,7 @@ testOldNpm() { ...@@ -56,7 +56,7 @@ testOldNpm() {
testSameNpm() { testSameNpm() {
compile "same-npm" compile "same-npm"
assertCaptured "Version 1.4.28 already installed" assertCaptured "npm 1.4.28 already installed"
assertCapturedSuccess assertCapturedSuccess
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment