feat: enable -x/use correct branches

Naramsim · Naramsim · commit 58e940daedf0 · 2020-05-01T23:38:02.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -23,7 +23,7 @@ jobs:
     - image: circleci/node:10.11.0
     steps:
     - checkout
-    - run: sh scripts/deploy.sh
+    - run: sh -x scripts/deploy.sh
 
 workflows:
   version: 2
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -5,9 +5,7 @@
 # $FIREBASE_DEPLOY_TOKEN, $FIREBASE_PROJECT_ID, $FIREBASE_DEPLOY_TOKEN_STAGING, $FIREBASE_PROJECT_ID_STAGING are present in CircleCI
 # $deploy_location is an environment variable set when the job is triggered by one of the two repositories getting pushed
 
-deploy_location='staging'
-
-if [ "${deploy_location:=master}" = 'master' ]; then # https://stackoverflow.com/a/2013589/3482533
+if [ "${deploy_location:=staging}" = 'master' ]; then # https://stackoverflow.com/a/2013589/3482533
     TOKEN=${FIREBASE_DEPLOY_TOKEN}
     PROJECT=${FIREBASE_PROJECT_ID}
 elif [ "${deploy_location}" = 'staging' ]; then
@@ -17,8 +15,6 @@ fi
 
 mkdir -p public
 
-deploy_location='master'
-
 # Get stored artifacts from api-data and unpack into the 'public' directory
 wget -O '_gen.tar.gz' --no-check-certificate "$(curl -s https://circleci.com/api/v1.1/project/github/PokeAPI/api-data/latest/artifacts?branch=${deploy_location} | jq -r .[0].url)"
 tar xzf _gen.tar.gz -C public
