Commit 5551cd72 authored by zeke's avatar zeke

use bin instead of node/bin

parent 25df93f0
...@@ -35,4 +35,10 @@ function indent() { ...@@ -35,4 +35,10 @@ function indent() {
Darwin) sed -l "$c";; Darwin) sed -l "$c";;
*) sed -u "$c";; *) sed -u "$c";;
esac esac
}
function cat_npm_debug_log() {
if [ -f $BUILD_DIR/npm-debug.log ]; then
cat $BUILD_DIR/npm-debug.log
fi
} }
\ No newline at end of file
...@@ -8,19 +8,21 @@ NODE_URL="http://s3pository.heroku.com/node/v$NODE_VERSION/node-v$NODE_VERSION-l ...@@ -8,19 +8,21 @@ NODE_URL="http://s3pository.heroku.com/node/v$NODE_VERSION/node-v$NODE_VERSION-l
source $BIN_DIR/common.sh source $BIN_DIR/common.sh
# Output debug info on exit
trap cat_npm_debug_log EXIT
status "Downloading node v$NODE_VERSION" status "Downloading node v$NODE_VERSION"
echo "$NODE_URL" | indent echo "$NODE_URL" | indent
tar_download $NODE_URL $BUILD_DIR tar_download $NODE_URL $BUILD_DIR
status "Moving node and npm to build directory" status "Moving node and npm to build directory"
mv $BUILD_DIR/node-v$NODE_VERSION-linux-x64 $BUILD_DIR/node mv $BUILD_DIR/node-v$NODE_VERSION-linux-x64 $BUILD_DIR/bin
status "Making node and npm executable" status "Making node and npm executable"
chmod +x $BUILD_DIR/node/bin/* chmod +x $BUILD_DIR/bin/*
status "Adding node and npm to the \$PATH" status "Adding node and npm to the \$PATH"
PATH=$PATH:$BUILD_DIR/node/bin PATH="$BUILD_DIR/bin:$PATH"
echo "node version $NODE_VERSION has been installed" | indent
status "Installing dependencies with npm" status "Installing dependencies with npm"
cd $BUILD_DIR cd $BUILD_DIR
......
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