Skip to content
Snippets Groups Projects
Commit 90edd88b authored by Kenneth Reitz's avatar Kenneth Reitz
Browse files

cleanup collectstatic stuff, before release

parent 2533cc68
No related branches found
No related tags found
No related merge requests found
...@@ -27,7 +27,7 @@ bpwatch start collectstatic # metrics collection ...@@ -27,7 +27,7 @@ bpwatch start collectstatic # metrics collection
if [ ! "$DISABLE_COLLECTSTATIC" ] && [ -f "$MANAGE_FILE" ] && [ "$DJANGO_INSTALLED" ]; then if [ ! "$DISABLE_COLLECTSTATIC" ] && [ -f "$MANAGE_FILE" ] && [ "$DJANGO_INSTALLED" ]; then
set +e set +e
echo "-----> Preparing static assets with 'collectstatic'" echo "-----> $ python $MANAGE_FILE collectstatic --noinput"
# Run collectstatic, cleanup some of the noisy output. # Run collectstatic, cleanup some of the noisy output.
python $MANAGE_FILE collectstatic --noinput --traceback 2>&1 | sed '/^Post-processed/d;/^Copying/d;/^$/d' | indent python $MANAGE_FILE collectstatic --noinput --traceback 2>&1 | sed '/^Post-processed/d;/^Copying/d;/^$/d' | indent
...@@ -37,10 +37,17 @@ if [ ! "$DISABLE_COLLECTSTATIC" ] && [ -f "$MANAGE_FILE" ] && [ "$DJANGO_INSTALL ...@@ -37,10 +37,17 @@ if [ ! "$DISABLE_COLLECTSTATIC" ] && [ -f "$MANAGE_FILE" ] && [ "$DJANGO_INSTALL
# Display a warning if collectstatic failed. # Display a warning if collectstatic failed.
[ $COLLECTSTATIC_STATUS -ne 0 ] && { [ $COLLECTSTATIC_STATUS -ne 0 ] && {
echo
echo " ! Error while running '$ python $MANAGE_FILE collectstatic --noinput'."
echo " See traceback above for details."
echo
echo " You may need to update application code to resolve this error."
echo " Or, you can disable collectstatic for this application:"
echo
echo " $ heroku config:set DISABLE_COLLECTSTATIC=1"
echo echo
echo " ! Error while runnning '$ python $MANAGE_FILE collectstatic --noinput'." echo " http://devcenter.heroku.com/articles/django-assets"
echo " See traceback above for more details."
echo " More info: http://devcenter.heroku.com/articles/django-assets"
# Additionally, dump out the environment, if debug mode is on. # Additionally, dump out the environment, if debug mode is on.
if [ "$DEBUG_COLLECTSTATIC" ]; then if [ "$DEBUG_COLLECTSTATIC" ]; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment