Cleanup the setup-credentials-helper.sh

Author: calind

images/build/root/usr/local/bin/setup-credentials-helper.sh

@@ -1,13 +1,12 @@
 #!/bin/bash
-: ${GOOGLE_CREDENTIALS:="$(cat "$PLUGIN_GOOGLE_CREDENTIALS_FILE" 2>/dev/null)"}
-: ${GOOGLE_CLOUD_PROJECT_PROJECT:="$PLUGIN_GOOGLE_CLOUD_PROJECT"}
-: ${CLUSTER:="$PLUGIN_CLUSTER"}
-: ${ZONE:="$PLUGIN_ZONE"}
-: ${UPGRADE_TILLER:="$PLUGIN_UPGRADE_TILLER"}
-: ${SSH_KEY:="$PLUGIN_SSH_KEY"}
-: ${DOCKER_USERNAME:="$PLUGIN_DOCKER_USERNAME"}
-: ${DOCKER_PASSWORD:="$PLUGIN_DOCKER_PASSWORD"}
-: ${DOCKER_REGISTRY:="${PLUGIN_DOCKER_REGISTRY:-docker.io}"}
+: "${GOOGLE_CREDENTIALS:="$(cat "$PLUGIN_GOOGLE_CREDENTIALS_FILE" 2>/dev/null)"}"
+: "${GOOGLE_CLOUD_PROJECT:="$PLUGIN_GOOGLE_CLOUD_PROJECT"}"
+: "${CLUSTER:="$PLUGIN_CLUSTER"}"
+: "${ZONE:="$PLUGIN_ZONE"}"
+: "${SSH_KEY:="$PLUGIN_SSH_KEY"}"
+: "${DOCKER_USERNAME:="$PLUGIN_DOCKER_USERNAME"}"
+: "${DOCKER_PASSWORD:="$PLUGIN_DOCKER_PASSWORD"}"
+: "${DOCKER_REGISTRY:="${PLUGIN_DOCKER_REGISTRY:-docker.io}"}"
 
 export PATH="$CI_WORKSPACE/bin:$PATH"
 
@@ -33,23 +32,23 @@ run() {
     "$@"
 }
 
-if [ ! -z "$DOCKER_PASSWORD" ] ; then
+if [ -n "$DOCKER_PASSWORD" ] ; then
     require_param DOCKER_USERNAME
     echo "+ docker login $DOCKER_REGISTRY -u $DOCKER_USERNAME"
-    docker login $DOCKER_REGISTRY -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
+    docker login "$DOCKER_REGISTRY" -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"
 fi
 
-if [ ! -z "$GOOGLE_CREDENTIALS" ] ; then
+if [ -n "$GOOGLE_CREDENTIALS" ] ; then
     echo "$GOOGLE_CREDENTIALS" > /run/google-credentials.json
     run gcloud auth activate-service-account --quiet --key-file=/run/google-credentials.json
     run gcloud auth configure-docker --quiet
 fi
 
-if [ ! -z "$GOOGLE_CLOUD_PROJECT" ] ; then
+if [ -n "$GOOGLE_CLOUD_PROJECT" ] ; then
     run gcloud config set project "$GOOGLE_CLOUD_PROJECT"
 fi
 
-if [ ! -z "$CLUSTER" ] ; then
+if [ -n "$CLUSTER" ] ; then
     require_google_credentials
     require_param "cluster"
     require_param "project"
@@ -60,7 +59,7 @@ if [ ! -z "$CLUSTER" ] ; then
     run kubectl version
 fi
 
-if [ ! -z "$SSH_KEY" ] ; then
+if [ -n "$SSH_KEY" ] ; then
     require_param "home"
     test -d "$HOME/.ssh" || mkdir -p "$HOME/.ssh"
     echo "$SSH_KEY" > "$HOME/.ssh/id_rsa"
@@ -69,9 +68,9 @@ if [ ! -z "$SSH_KEY" ] ; then
     run ssh-keygen -y -f "$HOME/.ssh/id_rsa"
 fi
 
-if [[ ! -z "${GIT_USER}" && ! -z "${GIT_PASSWORD}" ]] ; then
-    git config --global user.email ${GIT_EMAIL:-bot@bitpoke.cloud}
-    git config --global user.name $GIT_USER
+if [[ -n "${GIT_USER}" && -n "${GIT_PASSWORD}" ]] ; then
+    git config --global user.email "${GIT_EMAIL:-bot@bitpoke.cloud}"
+    git config --global user.name "$GIT_USER"
 
     cat <<EOF >> ~/.netrc
 machine ${GIT_HOST:-github.com}