Skip to content

H
heroku-buildpack-python
Commit ca3b3808 authored by Kenneth Reitz's avatar Kenneth Reitz
Browse files
Options

simplify purge

parent 287b3988
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 12 deletions
bin/compile
View file @ ca3b3808
...@@ -75,10 +75,6 @@ cd $BUILD_DIR ...@@ -75,10 +75,6 @@ cd $BUILD_DIR
# Experimental pre_compile hook. # Experimental pre_compile hook.
source $BIN_DIR/steps/hooks/pre_compile source $BIN_DIR/steps/hooks/pre_compile
# ### Sanity Checks
#
# Just a little peace of mind.
# If no requirements given, assume `setup.py develop`. # If no requirements given, assume `setup.py develop`.
if [ ! -f requirements.txt ]; then if [ ! -f requirements.txt ]; then
puts-step "No requirements.txt provided; assuming dist package." puts-step "No requirements.txt provided; assuming dist package."
...@@ -89,11 +85,6 @@ fi ...@@ -89,11 +85,6 @@ fi
mkdir -p $CACHE_DIR mkdir -p $CACHE_DIR
[ ! "$(ls -A $CACHE_DIR)" ] && export FRESH_APP=1 [ ! "$(ls -A $CACHE_DIR)" ] && export FRESH_APP=1
# Nice defaults.
VIRTUALENV_LOC=$VIRTUALENV_LOC
VIRTUALENV_DIRS=$VIRTUALENV_LOC
# Purge "old-style" virtualenvs. # Purge "old-style" virtualenvs.
[ -d $CACHE_DIR/$LEGACY_TRIGGER ] && rm -fr $CACHE_DIR/* [ -d $CACHE_DIR/$LEGACY_TRIGGER ] && rm -fr $CACHE_DIR/*
...@@ -128,9 +119,9 @@ OUT=$(virtualenv --python $PYTHON_EXE --distribute --never-download --prompt='(v ...@@ -128,9 +119,9 @@ OUT=$(virtualenv --python $PYTHON_EXE --distribute --never-download --prompt='(v
then echo " ! CLEAN_VIRTUALENV set, rebuilding virtualenv." then echo " ! CLEAN_VIRTUALENV set, rebuilding virtualenv."
else echo " ! Virtualenv corrupt, rebuilding." else echo " ! Virtualenv corrupt, rebuilding."
fi fi
for dir in $VIRTUALENV_DIRS; do
rm -fr $dir &> /dev/null || true rm -fr $VIRTUALENV_LOC &> /dev/null || true
done
OUT=$(virtualenv --python $PYTHON_EXE --distribute --never-download --prompt='(venv) ' $VIRTUALENV_LOC ) OUT=$(virtualenv --python $PYTHON_EXE --distribute --never-download --prompt='(venv) ' $VIRTUALENV_LOC )
} }
echo "$OUT" | cleanup | indent echo "$OUT" | cleanup | indent
......
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