From f7e0541039b76af77d6a1b9e336e63c1919b79e8 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Fri, 11 Nov 2011 13:18:01 -0800
Subject: [PATCH] .heroku folder
---
bin/compile | 15 +++++++++++----
bin/release | 4 ++--
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/bin/compile b/bin/compile
index d2dcda56..a790de15 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 c0aa9abc..9a70a475 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
--
GitLab