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

Merge branch '676-bsd-sed' of https://github.com/flah00/diaspora into flah00-676-bsd-sed

Browse source
This commit is contained in:
MrZYX 2010-12-08 19:36:14 +01:00
commit 9925aba066
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
script/server
View file

@ -70,7 +70,15 @@ function redis_config
fi fi
cp $redis_conf config/redis.conf cp $redis_conf config/redis.conf
sed -i '/^[^#]*daemonize/s/yes/no/' config/redis.conf case $OS in
## bsd sed doesn't seem to handle empty in-place edits correctly
*[Bb][Ss][Dd]*|Darwin)
sed -i '' '/^[^#]*daemonize/s/yes/no/' config/redis.conf
;;
*)
sed -i '/^[^#]*daemonize/s/yes/no/' config/redis.conf
;;
esac
} }
# Scan for -p, find out what port thin is about to use. # Scan for -p, find out what port thin is about to use.