Unverified Commit b80eb01f authored by Brad Koehn's avatar Brad Koehn Committed by Benjamin Neff
Browse files

piped bin/bundle commands to suppress warnings when run on readonly filesystems 

closes #7719
parent 3e31b91b

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


## Refactor

* Don't print a warning when starting the server outside a Git repo [#7712](https://github.com/diaspora/diaspora/pull/7712)

* Make script/server work on readonly filesystems [#7719](https://github.com/diaspora/diaspora/pull/7719)



## Bug fixes

script/server

+4 −3
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ fi 
# Setup environment

if [ -z "$RAILS_ENV" ]

then

  RAILS_ENV=$(bin/bundle exec ruby ./script/get_config.rb server.rails_environment)

  RAILS_ENV=$(bin/bundle exec ruby ./script/get_config.rb server.rails_environment | grep -vE "is not writable|as your home directory temporarily" )

  on_failure "Couldn't parse config/diaspora.yml!"

  export RAILS_ENV

fi
@@ -113,7 +113,8 @@ vars=$(bin/bundle exec ruby ./script/get_config.rb \ 
  chat=chat.enabled \

  chat_server=chat.server.enabled \

  chat_bosh_proxy=chat.server.bosh.proxy \

  redis_url=environment.redis

  redis_url=environment.redis \

  | grep -vE "is not writable|as your home directory temporarily"

)

on_failure "Couldn't parse config/diaspora.yml!"

eval "$vars"
@@ -170,7 +171,7 @@ then 
  then

    redis_param="url: '$redis_url'"

  fi 

  if [ "$(bin/bundle exec ruby -e "require 'redis'; puts Redis.new($redis_param).ping" 2> /dev/null)" != "PONG" ]

  if [ "$(bin/bundle exec ruby -e "require 'redis'; puts Redis.new($redis_param).ping" 2> /dev/null | grep -vE "is not writable|as your home directory temporarily" )" != "PONG" ]

  then

    fatal "Can't connect to redis. Please check if it's running and if environment.redis is configured correctly in config/diaspora.yml."

  fi