Use $CACHE_DIR for composer cache.

ustramooner · Jul 20, 2012 · 09a2659 · 09a2659
1 parent 5e0575a
commit 09a2659
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/bin/compile b/bin/compile
@@ -53,11 +53,12 @@ BUILD_DIR=$1
 CACHE_DIR=$2
 BUNDLE_DIR="${CACHE_DIR}/bundles"
 LP_DIR=`cd $(dirname $0); cd ..; pwd`
+export COMPOSER_HOME="${CACHE_DIR}/.composer"
 
 # include .files when moving things around
 shopt -s dotglob
 
-mkdir -p $BUILD_DIR $CACHE_DIR ${BUNDLE_DIR} ${BUILD_DIR}/local ${BUILD_DIR}/vendor/bin
+mkdir -p $BUILD_DIR $CACHE_DIR ${BUNDLE_DIR} ${BUILD_DIR}/local ${BUILD_DIR}/vendor/bin ${COMPOSER_HOME}
 
 echo "-----> Fetching Manifest"
 pushd ${BUNDLE_DIR} > /dev/null
@@ -180,7 +181,7 @@ then
 
 	# do the deed!
 	echo "Running: php composer.phar install" | indent
-	LD_LIBRARY_PATH="${BUILD_DIR}/local/lib" ${BUILD_DIR}/vendor/php/bin/php composer.phar install | indent
+	LD_LIBRARY_PATH="${BUILD_DIR}/local/lib" ${BUILD_DIR}/vendor/php/bin/php composer.phar install -n | indent
 
 	export GIT_DIR=$GIT_DIR_ORIG
 fi

diff --git a/test/compile_test.sh b/test/compile_test.sh
@@ -92,4 +92,6 @@ EOF
 	assertCaptured "Running: php composer.phar install"
 	assertCaptured "packforlan/packtest"
 	assertTrue "packforlan/packtest package exists" "[ -f ${BUILD_DIR}/vendor/packforlan/packtest/composer.json ]"
+
+	assertTrue "composer cache exists in cache dir" "[ -d ${CACHE_DIR}/.composer/cache ]"
 }