much better

bin/compile

@@ -171,7 +171,7 @@ set -e
 source $BIN_DIR/steps/pylibmc
 
 # Install Mercurial if it appears to be required.
-if (in-req "hg+" requirements.txt) then
+if (grep -Fiq "hg+" requirements.txt) then
   pip install --use-mirrors mercurial | cleanup | indent
 fi
 
@@ -193,7 +193,6 @@ done
 
 # Set context environment variables.
 set-env PATH '$HOME/.heroku/python/bin:$PATH'
-# set-env PYTHONHOME /app/.heroku/python/
 set-env PYTHONUNBUFFERED true
 set-default-env LIBRARY_PATH /app/.heroku/vendor/lib
 set-default-env LD_LIBRARY_PATH /app/.heroku/vendor/lib
@@ -203,11 +202,10 @@ set-default-env PYTHONPATH /app/
 un-set-env PYTHONHOME
 
 
+# Experimental post_compile hook.
+source $BIN_DIR/steps/hooks/post_compile
+
 # ### Fin.
 
 deep-mv $BUILD_DIR $ORIG_BUILD_DIR
 deep-mv $TMP_APP_DIR $APP_DIR
-
-
-# Experimental post_compile hook.
-source $BIN_DIR/steps/hooks/post_compile

bin/steps/pylibmc

@@ -16,7 +16,7 @@ VENDORED_MEMCACHED="http://cl.ly/0a191R3K160t1w1P0N25/vendor-libmemcached.tar.gz
 source $BIN_DIR/utils
 
 # If pylibmc exists within requirements, use vendored libmemcached.
-if (in-req "pylibmc" requirements.txt) then
+if (grep -Fiq "pylibmc" requirements.txt) then
   echo "-----> Noticed pylibmc. Bootstrapping libmemcached."
   cd .heroku
 

bin/utils

@@ -52,25 +52,3 @@ function deep-mv (){
   rm -fr $1/!(tmp)
   find -H $1 -maxdepth 1 -name '.*' -a \( -type d -o -type f -o -type l \) -exec rm -fr '{}' \;
 }
-
-# Recursively finds requirements.txt files
-function list-req (){
-  echo $@
-  for req in $(grep -Fie "-r " $@ | sed 's/-r //g')
-    do
-      path="$(dirname $@)/$req"
-      list-req $path
-    done
-}
-
-# Find pattern in requirements files recursively
-# Usage: $ in-req pattern file
-function in-req (){
-  for file in $(list-req $2)
-    do
-      if (grep -Fiqe "$1" "$file") then
-        return 0
-      fi
-    done
-  return 1
-}