From 9ada201b82969785cda48f232eed562a7b374f75 Mon Sep 17 00:00:00 2001
From: "Quentin McGaw (desktop)" <quentin.mcgaw@gmail.com>
Date: Tue, 25 Feb 2020 11:47:08 +0000
Subject: [PATCH] Fixed and improved CI script

---
 ci.sh | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/ci.sh b/ci.sh
index 563b11d4..dd6cf889 100644
--- a/ci.sh
+++ b/ci.sh
@@ -1,23 +1,24 @@
 #!/bin/bash
 
-echo -e "\n\nPull request: $TRAVIS_PULL_REQUEST\nRelease tag: $TRAVIS_TAG\nBranch: $TRAVIS_BRANCH\n\n"
+ARCHS=linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x
 
-if [ ! -z "$TRAVIS_PULL_REQUEST" ]; then
+echo -e "\n\nPull request: $TRAVIS_PULL_REQUEST\nRelease tag: $TRAVIS_TAG\nBranch: $TRAVIS_BRANCH\n\nTarget arch: $ARCHS\n\n"
+
+if [  "$TRAVIS_PULL_REQUEST" != "false" ]; then
   echo -e "\n\nBuilding pull request without pushing to Docker Hub\n\n"
   docker buildx build \
     --progress plain \
-    --platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x \
+    --platform="$ARCHS" \
     .
   exit $?
 fi
 
-echo $DOCKER_PASSWORD | docker login -u qmcgaw --password-stdin 2>&1 | tail -n 1
+echo $DOCKER_PASSWORD | docker login -u qmcgaw --password-stdin 2>&1
 
 TAG="$TRAVIS_TAG"
-if [ -z $TAG ]; then
-  if [ "$TRAVIS_BRANCH" = "master" ]; then
-    TAG=latest
-  else
+if [ -z "$TAG" ]; then
+  TAG=latest
+  if [ "$TRAVIS_BRANCH" != "master" ]; then
     TAG="$TRAVIS_BRANCH"
   fi
 fi
@@ -25,7 +26,7 @@ fi
 echo -e "\n\nBuilding Docker images for \"$DOCKER_REPO:$TAG\"\n\n"
 docker buildx build \
     --progress plain \
-    --platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x \
+    --platform="$ARCHS" \
     --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
     --build-arg VCS_REF=`git rev-parse --short HEAD` \
     --build-arg VERSION=$TAG \