Chore: Upgrade Jenkins-job-builder to 6.3.0

[releng/global-jjb.git] / shell / docker-login.sh

diff --git a/shell/docker-login.sh b/shell/docker-login.sh
index d172a3b..73d0603 100644 (file)
--- a/shell/docker-login.sh
+++ b/shell/docker-login.sh
@@ -46,8 +46,10 @@ echo "---> docker-login.sh"
 # Ensure we fail the job if any steps fail
 set -eu -o pipefail
 
-#Check if current version less than desired version
-version_lt() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1"; }
+# Check if current version less than desired version
+version_lt() {
+    test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" != "$1";
+}
 
 # Execute the credential lookup and set
 set_creds() {
@@ -77,7 +79,7 @@ set_creds() {
 do_login() {
     docker_version=$( docker -v | awk '{print $3}')
     if version_lt "$docker_version" "17.06.0" && \
-       "$DOCKERHUB_REGISTRY" == "docker.io" && \
+       [ "$DOCKERHUB_REGISTRY" == "docker.io" ] && \
        "$DOCKERHUB_EMAIL:-none" != 'none'
     then
         docker login -u "$USER" -p "$PASS" -e "$2" "$1"