diff --git a/bin/compile b/bin/compile index 70493f6bea43042a768ce6b9f894ff61a5ac34e4..69d5c12fc8d83e1bd3d1696ef53b8756518e5ae4 100755 --- a/bin/compile +++ b/bin/compile @@ -183,7 +183,7 @@ pip install --use-mirrors -r requirements.txt --src ./.heroku/src | indent # # See [`bin/steps/django`](django.html). -if [ "$NAME" = "Python/Django" ] && ! [ "$DISABLE_INJECTION" ]; then +if [ "$NAME" = "Python/Django" ]; then source $BIN_DIR/steps/django/init fi diff --git a/bin/steps/django/init b/bin/steps/django/init index 947f866df47a6b0c080d05260704ff5c44519519..383ee1621e06af37db1f2f1c4d775ae13ccd49c6 100755 --- a/bin/steps/django/init +++ b/bin/steps/django/init @@ -11,5 +11,8 @@ PROJECT=$(dirname $SETTINGS_FILE) export SETTINGS_FILE PROJECT -source injection +if [ "$DISABLE_INJECTION" ]; then + source injection +fi + source collectstatic \ No newline at end of file diff --git a/bin/steps/django/injection b/bin/steps/django/injection index f48ca13b6298bd772a32918dd23cb9fa844e83a0..3d2796a07972e91c187f4f49cc078d390e99f237 100755 --- a/bin/steps/django/injection +++ b/bin/steps/django/injection @@ -12,12 +12,6 @@ # ## Sanity Checks # -# Reject a Django app that appears to be packaged incorrectly. -if [ -f settings.py ]; then - echo " ! Django app must be in a package subdirectory" - exit 1 -fi - echo "-----> Installing dj-database-url..." pip install --use-mirrors dj-database-url | indent