Browse files

Merge branch 'master' into wfarr-upload-all-the-formats

  • Loading branch information...
2 parents 489c4a4 + 0a2b279 commit cc03263838008bc7cf0b1d11f0bc9cfa9a16a0fb @holman holman committed Apr 27, 2012
Showing with 12 additions and 11 deletions.
  1. +12 −11 script/bootstrap
View
23 script/bootstrap
@@ -160,18 +160,19 @@ auth_token=`date | md5`
# Set up play.yml
if test -f config/play.yml
then
- echo " + Backing up your existing play.yml configuration."
- rm -f config/play.backup.yml
- mv config/play.yml config/play.backup.yml
+ #echo " + Backing up your existing play.yml configuration."
+ #rm -f config/play.backup.yml
+ #mv config/play.yml config/play.backup.yml
+else
+ cat config/play.example.yml | sed \
+ -e "s/__OAUTH_KEY__/$client_id/" \
+ -e "s/__OAUTH_SECRET__/$client_secret/" \
+ -e "s/__PUSHER_APP_ID__/$pusher_app_id/" \
+ -e "s/__PUSHER_KEY__/$pusher_key/" \
+ -e "s/__PUSHER_SECRET__/$pusher_secret/" \
+ -e "s/__AUTH_TOKEN__/$auth_token/" \
+ > config/play.yml
fi
-cat config/play.example.yml | sed \
- -e "s/__OAUTH_KEY__/$client_id/" \
- -e "s/__OAUTH_SECRET__/$client_secret/" \
- -e "s/__PUSHER_APP_ID__/$pusher_app_id/" \
- -e "s/__PUSHER_KEY__/$pusher_key/" \
- -e "s/__PUSHER_SECRET__/$pusher_secret/" \
- -e "s/__AUTH_TOKEN__/$auth_token/" \
- > config/play.yml
#
# Startup instructions

0 comments on commit cc03263

Please sign in to comment.