nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5885 from mrbrdo/server-script-fix

Browse source 
fix broken output of script/server
This commit is contained in:
Jonne Haß 2015-04-25 16:30:36 +02:00
commit e50dfea875
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -11,6 +11,7 @@
* Hide manage services link in the publisher on certain pages [#5854](https://github.com/diaspora/diaspora/pull/5854) * Hide manage services link in the publisher on certain pages [#5854](https://github.com/diaspora/diaspora/pull/5854)
* Fix notification mails for limited posts [#5877](https://github.com/diaspora/diaspora/pull/5877) * Fix notification mails for limited posts [#5877](https://github.com/diaspora/diaspora/pull/5877)
* Fix medium and small avatar URLs when using Camo [#5883](https://github.com/diaspora/diaspora/pull/5883) * Fix medium and small avatar URLs when using Camo [#5883](https://github.com/diaspora/diaspora/pull/5883)
* Improve output of script/server [#5885](https://github.com/diaspora/diaspora/pull/5885)
## Features ## Features
* Hide post title of limited post in comment notification email [#5843](https://github.com/diaspora/diaspora/pull/5843) * Hide post title of limited post in comment notification email [#5843](https://github.com/diaspora/diaspora/pull/5843)

4
script/server
View file

@ -120,7 +120,7 @@ then
fi fi
# Check if assets are precompiled # Check if assets are precompiled
if [ "$RAILS_ENV" = "production" -a -z "$(find public/assets -maxdepth 1 -name 'home-*.css' -print -quit)" ] if [ "$RAILS_ENV" = "production" -a -z "$(find public/assets -maxdepth 1 -name 'home-*.css' -print -quit 2>/dev/null)" ]
then then
fatal "You're running in production mode without having assets fatal "You're running in production mode without having assets
precompiled. Now and after each update before you restart the precompiled. Now and after each update before you restart the
@ -159,7 +159,7 @@ diaspora.yml.example
fi fi
# Start Diaspora # Start Diaspora
echo -n "Starting Diaspora in $RAILS_ENV mode on port $port " printf "Starting Diaspora in $RAILS_ENV mode on port $port "
if [ "$embed_sidekiq_worker" = "true" ] if [ "$embed_sidekiq_worker" = "true" ]
then then
echo "with a Sidekiq worker embedded into Unicorn." echo "with a Sidekiq worker embedded into Unicorn."