From f4051abc122144e39967b49557714c103bc2dd81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Andr=C3=A8s?= <leo@ndrs.fr>
Date: Mon, 12 Mar 2018 17:59:57 +0100
Subject: [PATCH] Clean shell scripts (#25704)

---
 build/ship.sh           | 56 ++++++++++++++++++++---------------------
 build/upload-preview.sh |  2 +-
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/build/ship.sh b/build/ship.sh
index d252cd38f3..e3b256e914 100755
--- a/build/ship.sh
+++ b/build/ship.sh
@@ -9,62 +9,62 @@
 
 red=$'\e[1;31m'
 green=$'\e[1;32m'
-blue=$'\e[1;34m'
+#blue=$'\e[1;34m'
 magenta=$'\e[1;35m'
-cyan=$'\e[1;36m'
+#cyan=$'\e[1;36m'
 end=$'\e[0m'
 
 # Get current version from package.json
 current_version=$(node -p "require('./package.json').version")
 
 if [[ $# -lt 1 ]]; then
-  printf "\n${red}⚠️  Shipping aborted. You must specify a version.\n${end}"
+  printf "\n%s⚠️  Shipping aborted. You must specify a version.\n%s" $red $end
   exit 1
 fi
 
 # Pulling latest changes, just to be sure
-printf "\n${magenta}=======================================================${end}"
-printf "\n${magenta}Pulling latest changes...${end}"
-printf "\n${magenta}=======================================================\n\n${end}"
+printf "\n%s=======================================================%s" $magenta $end
+printf "\n%sPulling latest changes...%s" $magenta $end
+printf "\n%s=======================================================\n\n%s" $magenta $end
 git pull origin v4-dev
 
 # Update version number
-printf "\n${magenta}=======================================================${end}"
-printf "\n${magenta}Updating version number...${end}"
-printf "\n${magenta}=======================================================\n${end}"
-npm run release-version $current_version $1
+printf "\n%s=======================================================%s" $magenta $end
+printf "\n%sUpdating version number...%s" $magenta $end
+printf "\n%s=======================================================\n%s" $magenta $end
+npm run release-version "$current_version" "$1"
 
 # Compile latest CSS and JS
-printf "\n${magenta}=======================================================${end}"
-printf "\n${magenta}Compile latest CSS and JS...${end}"
-printf "\n${magenta}=======================================================\n${end}"
+printf "\n%s=======================================================%s" $magenta $end
+printf "\n%sCompile latest CSS and JS...%s" $magenta $end
+printf "\n%s=======================================================\n%s" $magenta $end
 npm run dist
 
 # Generate the SRI hashes
-printf "\n${magenta}=======================================================${end}"
-printf "\n${magenta}Generate the SRI hashes...${end}"
-printf "\n${magenta}=======================================================\n${end}"
+printf "\n%s=======================================================%s" $magenta $end
+printf "\n%sGenerate the SRI hashes...%s" $magenta $end
+printf "\n%s=======================================================\n%s" $magenta $end
 npm run release-sri
 
 # Compress the dist files
-printf "\n${magenta}=======================================================${end}"
-printf "\n${magenta}Compressing the dist files...${end}"
-printf "\n${magenta}=======================================================\n${end}"
+printf "\n%s=======================================================%s" $magenta $end
+printf "\n%sCompressing the dist files...%s" $magenta $end
+printf "\n%s=======================================================\n%s" $magenta $end
 npm run release-zip
 
 # Compile the docs
-printf "\n${magenta}=======================================================${end}"
-printf "\n${magenta}Compile hosted documentation...${end}"
-printf "\n${magenta}=======================================================\n${end}"
+printf "\n%s=======================================================%s" $magenta $end
+printf "\n%sCompile hosted documentation...%s" $magenta $end
+printf "\n%s=======================================================\n%s" $magenta $end
 npm run docs-github
 
 # Copy the contents of the built docs site over to `bs-docs` repo
-printf "\n${magenta}=======================================================${end}"
-printf "\n${magenta}Copy it over...${end}"
-printf "\n${magenta}=======================================================\n${end}"
+printf "\n%s=======================================================%s" $magenta $end
+printf "\n%sCopy it over...%s" $magenta $end
+printf "\n%s=======================================================\n%s" $magenta $end
 cp -rf _gh_pages/. ../bs-docs/
 printf "\nDone!\n"
 
-printf "\n${green}=======================================================${end}"
-printf "\n${green}Success, $1 is ready to review and publish.${end}"
-printf "\n${green}=======================================================\n\n${end}"
+printf "\n%s=======================================================%s" $green $end
+printf "\n%sSuccess, $1 is ready to review and publish.%s" $green $end
+printf "\n%s=======================================================\n\n%s" $green $end
diff --git a/build/upload-preview.sh b/build/upload-preview.sh
index 08edc35178..320a0af06b 100755
--- a/build/upload-preview.sh
+++ b/build/upload-preview.sh
@@ -5,7 +5,7 @@
 sed -i "/^current_version:/ s/\$/+pr.${TRAVIS_COMMIT}/" _config.yml
 bundle exec jekyll build --destination "$TRAVIS_COMMIT" --baseurl "/c/${TRAVIS_COMMIT}"
 
-openssl aes-256-cbc -K $encrypted_2b749c8e6327_key -iv $encrypted_2b749c8e6327_iv -in build/gcp-key.json.enc -out build/gcp-key.json -d
+openssl aes-256-cbc -K "${encrypted_2b749c8e6327_key:?}" -iv "${encrypted_2b749c8e6327_iv:?}" -in build/gcp-key.json.enc -out build/gcp-key.json -d
 gcloud auth activate-service-account "$GCP_SERVICE_ACCOUNT" --key-file build/gcp-key.json &> /dev/null || (echo 'GCP login failed!'; exit 1)
 
 echo "Uploading to http://preview.twbsapps.com/c/${TRAVIS_COMMIT} ..."