Commit 1ebb095a authored by Hunter Loftis's avatar Hunter Loftis

Merge pull request #157 from heroku/indent-npm

indent npm output
parents bc725a13 fda9c515
...@@ -98,7 +98,7 @@ if [ "$npm_engine" != "" ]; then ...@@ -98,7 +98,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
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 npm install --quiet -g npm@$npm_engine > /dev/null 2>&1 | indent
fi fi
# Run subsequent commands from the build directory # Run subsequent commands from the build directory
...@@ -129,22 +129,22 @@ if [ "$modules_source" == "" ]; then ...@@ -129,22 +129,22 @@ if [ "$modules_source" == "" ]; then
elif [ $modules_source == "prebuilt" ]; then elif [ $modules_source == "prebuilt" ]; then
info "Rebuilding any native modules for this architecture" info "Rebuilding any native modules for this architecture"
npm run preinstall npm run preinstall 2>&1 | indent
npm rebuild 2>&1 npm rebuild 2>&1 | indent
npm run postinstall npm run postinstall 2>&1 | indent
elif $use_cache; then elif $use_cache; then
info "Restoring node modules from cache" info "Restoring node modules from cache"
cp -r $cache_dir/node/node_modules $build_dir/ cp -r $cache_dir/node/node_modules $build_dir/
info "Pruning unused dependencies" info "Pruning unused dependencies"
npm prune 2>&1 npm prune 2>&1 | indent
info "Installing any new modules" info "Installing any new modules"
npm install --quiet --userconfig $build_dir/.npmrc 2>&1 npm install --quiet --userconfig $build_dir/.npmrc 2>&1 | indent
else else
info "Installing node modules" info "Installing node modules"
touch $build_dir/.npmrc touch $build_dir/.npmrc
npm install --quiet --userconfig $build_dir/.npmrc 2>&1 npm install --quiet --userconfig $build_dir/.npmrc 2>&1 | indent
fi fi
####### Create a Procfile if possible ####### Create a Procfile if possible
......
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