Commit d036bbe1 authored by Zeke Sikelianos's avatar Zeke Sikelianos

Merge pull request #45 from ddollar/diet

Always set node_version
parents ef57f219 d4e8ad92
...@@ -35,6 +35,7 @@ else ...@@ -35,6 +35,7 @@ else
if test $default_satisfies; then if test $default_satisfies; then
status "Using latest stable node version $stable_version" status "Using latest stable node version $stable_version"
node_version=$stable_version
else else
# Find all available versions from nodejs.org/dist # Find all available versions from nodejs.org/dist
args="" args=""
...@@ -90,4 +91,4 @@ fi ...@@ -90,4 +91,4 @@ fi
# Update the PATH # Update the PATH
status "Building runtime environment" status "Building runtime environment"
mkdir -p $build_dir/.profile.d mkdir -p $build_dir/.profile.d
echo "export PATH=\"\$HOME/node/bin:$HOME/bin:\$HOME/node_modules/.bin:\$PATH\"" > $build_dir/.profile.d/nodejs.sh echo "export PATH=\"\$HOME/node/bin:$HOME/bin:\$HOME/node_modules/.bin:\$PATH\"" > $build_dir/.profile.d/nodejs.sh
\ No newline at end of file
...@@ -54,6 +54,7 @@ testProfileCreated() { ...@@ -54,6 +54,7 @@ testProfileCreated() {
testNodeModulesCached() { testNodeModulesCached() {
cache=$(mktmpdir) cache=$(mktmpdir)
compile "node-modules-caching" $cache compile "node-modules-caching" $cache
assertCaptured "Caching node_modules for future builds"
assertEquals "1" "$(ls -1 $cache/node_modules/0.10.18 | wc -l)" assertEquals "1" "$(ls -1 $cache/node_modules/0.10.18 | wc -l)"
} }
...@@ -88,4 +89,4 @@ assertFile() { ...@@ -88,4 +89,4 @@ assertFile() {
assertEquals "$1" "$(cat ${COMPILE_DIR}/$2)" assertEquals "$1" "$(cat ${COMPILE_DIR}/$2)"
} }
source ${BASE}/vendor/shunit2/shunit2 source ${BASE}/vendor/shunit2/shunit2
\ No newline at end of file
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