fix stupid heredoc usage in script/server

This commit is contained in:
Jonne Haß 2013-06-02 20:25:10 +02:00
parent 619ffa9d74
commit 5760f177ea

View file

@ -18,7 +18,7 @@ on_failure()
{ {
if [ $? != 0 ] if [ $? != 0 ]
then then
fatal $1 fatal "$1"
fi fi
} }
@ -108,10 +108,8 @@ then
branch=$(git branch | awk '/^[*]/ {print $2}') branch=$(git branch | awk '/^[*]/ {print $2}')
tar czf public/source.tar.gz $(git ls-tree -r $branch | awk '{print $4}') tar czf public/source.tar.gz $(git ls-tree -r $branch | awk '{print $4}')
else else
fatal <<MSG fatal "Can't generate public/source.tar.gz for you.
Can't generate public/source.tar.gz for you. Please tar up a copy of Please tar up a copy of your Diaspora installtion and place it there."
your Diaspora installtion and place it there.
MSG
fi fi
fi fi
@ -123,11 +121,10 @@ fi
# Check if assets are precompiled # Check if assets are precompiled
if [ "$RAILS_ENV" = "production" -a ! -e "public/assets/default.css" ] if [ "$RAILS_ENV" = "production" -a ! -e "public/assets/default.css" ]
then then
fatal <<MSG fatal "You're running in production mode without having assets
You're running in production mode without having assets precompiled. precompiled. Now and after each update before you restart the
Now and after each update before you restart the application, run: application, run:
bundle exec rake assets:precompile bundle exec rake assets:precompile"
MSG
fi fi
# Start Diaspora # Start Diaspora