Skip to content

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

better collectstatic pre-check

parent c9916dd2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
bin/steps/django/collectstatic
View file @ 4dea56d4
...@@ -8,14 +8,11 @@ indent() { ...@@ -8,14 +8,11 @@ indent() {
[ $(uname) == "Darwin" ] && sed -l "$RE" || sed -u "$RE" [ $(uname) == "Darwin" ] && sed -l "$RE" || sed -u "$RE"
} }
# Check if collectstatic is configured. # Check if collectstatic is configured.
python $MANAGE_FILE collectstatic --help &> /dev/null && RUN_COLLECTSTATIC=true python $MANAGE_FILE collectstatic --dry-run &> /dev/null && RUN_COLLECTSTATIC=true
# Don't raise errors if SILENCE_COLLECTSTATIC is set.
echo "-----> Collecting static files" echo "-----> Collecting static files"
set -e
# Compile assets if collectstatic appears to be kosher. # Compile assets if collectstatic appears to be kosher.
if [ "$RUN_COLLECTSTATIC" ]; then if [ "$RUN_COLLECTSTATIC" ]; then
...@@ -24,7 +21,7 @@ if [ "$RUN_COLLECTSTATIC" ]; then ...@@ -24,7 +21,7 @@ if [ "$RUN_COLLECTSTATIC" ]; then
[ $? -ne 0 ] && { [ $? -ne 0 ] && {
echo " ! Error running manage.py collectstatic. More info:" echo " ! Error running manage.py collectstatic. More info:"
echo " http://devcenter.heroku.com/articles/django-assets" echo " http://devcenter.heroku.com/articles/django-assets"
# exit 1 exit 1
} }
else else
......
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