Commit 86c611ab authored by David Dollar's avatar David Dollar

Merge pull request #14 from lackac/patch-1

Move CACHE_STORE_DIR assignment after setting NPM_VERSION
parents be3dbbe8 4d48184f
...@@ -18,8 +18,6 @@ S3_BUCKET="heroku-buildpack-nodejs" ...@@ -18,8 +18,6 @@ S3_BUCKET="heroku-buildpack-nodejs"
BUILD_DIR=$1 BUILD_DIR=$1
CACHE_DIR=$2 CACHE_DIR=$2
LP_DIR=`cd $(dirname $0); cd ..; pwd` LP_DIR=`cd $(dirname $0); cd ..; pwd`
CACHE_STORE_DIR="$CACHE_DIR/node_modules/$NPM_VERSION"
CACHE_TARGET_DIR="$BUILD_DIR/node_modules"
function error() { function error() {
echo " ! $*" echo " ! $*"
...@@ -124,6 +122,10 @@ echo "Using Node.js version: ${NODE_VERSION}" | indent ...@@ -124,6 +122,10 @@ echo "Using Node.js version: ${NODE_VERSION}" | indent
NPM_VERSION=$(package_resolve_version "npm") NPM_VERSION=$(package_resolve_version "npm")
echo "Using npm version: ${NPM_VERSION}" | indent echo "Using npm version: ${NPM_VERSION}" | indent
# cache directories
CACHE_STORE_DIR="$CACHE_DIR/node_modules/$NPM_VERSION"
CACHE_TARGET_DIR="$BUILD_DIR/node_modules"
# s3 packages # s3 packages
NODE_PACKAGE="http://${S3_BUCKET}.s3.amazonaws.com/nodejs-${NODE_VERSION}.tgz" NODE_PACKAGE="http://${S3_BUCKET}.s3.amazonaws.com/nodejs-${NODE_VERSION}.tgz"
NPM_PACKAGE="http://${S3_BUCKET}.s3.amazonaws.com/npm-${NPM_VERSION}.tgz" NPM_PACKAGE="http://${S3_BUCKET}.s3.amazonaws.com/npm-${NPM_VERSION}.tgz"
......
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