Update deploy and upgrade scripts to work on Unix (#176)

* Fix sed usage in Heroku upgrade/deploy scripts

* Fix sed usage in CF upgrade script

* Check existing buildpack before attempting to update it

Author: textbook

deployment/deploy-heroku.sh

@@ -53,32 +53,34 @@ CONFIG_DIR="$SCRIPT_DIR"/config
 ###################
 
 pushd "$ASSETS_DIR"/api
-heroku create ${API_HOST} --buildpack https://github.com/heroku/heroku-buildpack-ruby.git#v200
-heroku addons:create heroku-postgresql:hobby-dev -a ${API_HOST}
-heroku addons:create heroku-redis:hobby-dev -a ${API_HOST}
-heroku config:set WEBSOCKET_PORT=4443 CLIENT_ORIGIN=https://${WEB_HOST}.herokuapp.com SESSION_TIME=${SESSION_TIME} -a ${API_HOST}
+  heroku create ${API_HOST} --buildpack https://github.com/heroku/heroku-buildpack-ruby.git#v200
+  heroku addons:create heroku-postgresql:hobby-dev -a ${API_HOST}
+  heroku addons:create heroku-redis:hobby-dev -a ${API_HOST}
+  heroku config:set WEBSOCKET_PORT=4443 CLIENT_ORIGIN=https://${WEB_HOST}.herokuapp.com SESSION_TIME=${SESSION_TIME} -a ${API_HOST}
 
-rm -rf .git # blow away any existent git directory from a previous run
-git init .
-git add .
-git commit -m "Packaging for initial Heroku deployment"
-git push --set-upstream https://git.heroku.com/${API_HOST}.git master
-heroku run rake admin:create_user [email protected] ADMIN_PASSWORD=password -a ${API_HOST}
+  rm -rf .git # blow away any existent git directory from a previous run
+  git init .
+  git add .
+  git commit -m "Packaging for initial Heroku deployment"
+  git push --set-upstream https://git.heroku.com/${API_HOST}.git master
+  heroku run rake admin:create_user [email protected] ADMIN_PASSWORD=password -a ${API_HOST}
 popd
 
 ###########################
 # Deploy the web frontend
 ###########################
 
-cp "$CONFIG_DIR"/config.js "$ASSETS_DIR"/web/public_html
 pushd "$ASSETS_DIR"/web
-sed -i '' "s/{{api-app-name}}/${API_HOST}/" public_html/config.js
+  sed \
+    -e "s/{{api-app-name}}/${API_HOST}/" \
+    <"$CONFIG_DIR"/config.js \
+    >"$ASSETS_DIR"/web/public_html/config.js
 
-heroku create ${WEB_HOST} --buildpack https://github.com/heroku/heroku-buildpack-static
+  heroku create ${WEB_HOST} --buildpack https://github.com/heroku/heroku-buildpack-static
 
-rm -rf .git # blow away any existent git directory from a previous run
-git init .
-git add .
-git commit -m "Packaging for initial Heroku deployment"
-git push --set-upstream https://git.heroku.com/${WEB_HOST}.git master
+  rm -rf .git # blow away any existent git directory from a previous run
+  git init .
+  git add .
+  git commit -m "Packaging for initial Heroku deployment"
+  git push --set-upstream https://git.heroku.com/${WEB_HOST}.git master
 popd

deployment/upgrade-cf.sh

@@ -4,18 +4,23 @@ set -e
 
 WEB_HOST=$1
 API_HOST=$2
-CF_URL=${3:-https://api.run.pivotal.io}
+API_ENDPOINT=${3:-https://api.run.pivotal.io}
+APP_DOMAIN=${4:-cfapps.io}
 SESSION_TIME=${SESSION_TIME:-'""'}
 
 # The directory in which this script is located
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 ASSETS_DIR="$SCRIPT_DIR"/assets
 CONFIG_DIR="$SCRIPT_DIR"/config
 
-cf login -a $CF_URL
+cf login -a $API_ENDPOINT
 
 cf push -f "$CONFIG_DIR"/manifest-api.yml -p "$ASSETS_DIR"/api --var api-app-name=$API_HOST --var web-app-name=$WEB_HOST --var pcf-url=$CF_URL --var session-time=$SESSION_TIME
 
-sed -i '' "s/{{api-app-name}}/${API_HOST}/" "$CONFIG_DIR"/config.js
-cp "$CONFIG_DIR"/config.js "$ASSETS_DIR"/web
+sed \
+  -e "s/{{api-app-name}}/${API_HOST}/" \
+  -e "s/{{pcf-url}}/${APP_DOMAIN}/" \
+  <"$CONFIG_DIR"/config.js \
+  >"$ASSETS_DIR"/web/config.js
+
 cf push -f "$CONFIG_DIR"/manifest-web.yml -p "$ASSETS_DIR"/web --var api-app-name=$API_HOST --var web-app-name=$WEB_HOST

deployment/upgrade-heroku.sh

@@ -61,26 +61,30 @@ fi
 ###################
 
 pushd "$ASSETS_DIR"/api
-heroku buildpacks:set -a ${API_HOST} https://github.com/heroku/heroku-buildpack-ruby.git#v200
-
-rm -rf .git # blow away any existent git directory from a previous run
-git init .
-git add .
-git commit -m "Packaging for Heroku upgrade"
-git push --force --set-upstream https://git.heroku.com/${API_HOST}.git master
+  BUILDPACK='https://github.com/heroku/heroku-buildpack-ruby.git#v200'
+  if [[ ! $(heroku buildpacks -a ${API_HOST}) =~ ${BUILDPACK} ]]; then
+    heroku buildpacks:set -a ${API_HOST} ${BUILDPACK}
+  fi
+  rm -rf .git # blow away any existent git directory from a previous run
+  git init .
+  git add .
+  git commit -m "Packaging for Heroku upgrade"
+  git push --force --set-upstream https://git.heroku.com/${API_HOST}.git master
 popd
 
 ###########################
 # Upgrade the web frontend
 ###########################
 
-cp "$CONFIG_DIR"/config.js "$ASSETS_DIR"/web/public_html
 pushd "$ASSETS_DIR"/web
-sed -i '' "s/{{api-app-name}}/${API_HOST}/" public_html/config.js
+  sed \
+    -e "s/{{api-app-name}}/${API_HOST}/" \
+    <"$CONFIG_DIR"/config.js \
+    >"$ASSETS_DIR"/web/public_html/config.js
 
-rm -rf .git # blow away any existent git directory from a previous run
-git init .
-git add .
-git commit -m "Packaging for Heroku upgrade"
-git push --force --set-upstream https://git.heroku.com/${WEB_HOST}.git master
+  rm -rf .git # blow away any existent git directory from a previous run
+  git init .
+  git add .
+  git commit -m "Packaging for Heroku upgrade"
+  git push --force --set-upstream https://git.heroku.com/${WEB_HOST}.git master
 popd