From 35ce553ffee55630d976a11733bd5c9d610df0d2 Mon Sep 17 00:00:00 2001
From: Mike Nye <mike.nye@xpanse.com.au>
Date: Tue, 14 Apr 2020 08:12:16 +0800
Subject: [PATCH] Fixes & linting

---
 build_and_push.sh | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/build_and_push.sh b/build_and_push.sh
index 9fb3b05..00c090d 100755
--- a/build_and_push.sh
+++ b/build_and_push.sh
@@ -1,20 +1,19 @@
-#!/bin/sh
+#!/usr/bin/env sh
+#shellcheck shell=sh
 
-#VERSION=`picard -V | tr -s " " | cut -d " " -f 2 | tr -d ","`
-#ARCH=`uname -m`
-IMAGE=mikenye/picard
+REPO=mikenye
+IMAGE=picard
 
 # Build
-docker image rm ${IMAGE}:builder
+docker image rm ${REPO}/${IMAGE}:builder
 docker image rm jlesage/baseimage-gui:ubuntu-18.04
-docker build -f Dockerfile -t ${IMAGE}:builder .
+docker build -f Dockerfile -t ${REPO}/${IMAGE}:builder .
 
 # Get version
-VERSION=`docker run --rm --entrypoint picard mikenye/picard:builder -V | tail -1 | tr -s " " | cut -d " " -f 2 | tr -d ","`
+VERSION=$(docker run --rm --entrypoint picard ${REPO}/${IMAGE}:builder -V | tail -1 | tr -s " " | cut -d " " -f 2 | tr -d ",")
 
-docker tag ${IMAGE}:builder ${IMAGE}:${VERSION}
-docker tag ${IMAGE}:builder ${IMAGE}:latest
-
-docker push ${IMAGE}:${VERSION}
-docker push ${IMAGE}:latest
+docker tag ${REPO}/${IMAGE}:builder ${REPO}/${IMAGE}:${VERSION}
+docker tag ${REPO}/${IMAGE}:builder ${REPO}/${IMAGE}:latest
 
+docker push ${REPO}/${IMAGE}:${VERSION}
+docker push ${REPO}/${IMAGE}:latest