diff --git a/bin/compile b/bin/compile index d2dcda56d78d8adf42067a94c2f50c80ab880e2c..a790de15812378f1ff64786e8f5bcc9bfd2275d4 100755 --- a/bin/compile +++ b/bin/compile @@ -55,21 +55,28 @@ done echo "-----> Preparing virtualenv version $(virtualenv --version)" virtualenv --no-site-packages . | indent +# create set-aside .heroku folder. +mkdir .heroku + # if pylibmc within requirements, use vendored libmemcached if grep -Fxq "pylibmc" requirements.txt then echo "-----> Noticed pylibmc. Bootstrapping libmemcached." - curl -s -L -O http://cl.ly/0a191R3K160t1w1P0N25/vendor-libmemcached.tar.gz - tar -zxvf vendor-libmemcached.tar.gz > /dev/null - rm vendor-libmemcached.tar.gz + cd .heroku + + if ![ -d "vendor" ]; then + curl -s -L -O http://cl.ly/0a191R3K160t1w1P0N25/vendor-libmemcached.tar.gz + tar -zxvf vendor-libmemcached.tar.gz > /dev/null + rm vendor-libmemcached.tar.gz + fi export LIBMEMCACHED=$(pwd)/vendor + cd .. fi - # if Django, append settings if [ "$NAME" = "Python/Django" ]; then echo "-----> Django settings injection" diff --git a/bin/release b/bin/release index c0aa9abcc9284b51e1e479cf1638dd011cffe29b..9a70a4753c965e0c6111be2947033b95ff9392ad 100755 --- a/bin/release +++ b/bin/release @@ -16,8 +16,8 @@ EOF if grep -Fxq "pylibmc" $BUILD_DIR/requirements.txt then cat <<EOF - LIBRARY_PATH: ./vendor/lib - LD_LIBRARY_PATH: ./vendor/lib + LIBRARY_PATH: .heroku/vendor/lib + LD_LIBRARY_PATH: .heroku/vendor/lib EOF fi