From 6a6141bd0336a1ccb3ed684bb2db9ca67c9c5eed Mon Sep 17 00:00:00 2001
From: Jeremy Frasier <jeremy.frasier@trio.dhs.gov>
Date: Wed, 27 Feb 2019 13:56:22 -0500
Subject: [PATCH] Make shellcheck happy

---
 bump_version.sh                        | 22 +++++++++++++---------
 tag.sh                                 |  6 +++++-
 travis_scripts/build_docker_image.sh   |  6 +++++-
 travis_scripts/deploy_to_docker_hub.sh |  6 +++++-
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/bump_version.sh b/bump_version.sh
index 8a35f05..bfed350 100755
--- a/bump_version.sh
+++ b/bump_version.sh
@@ -1,39 +1,43 @@
-#/usr/bin/env bash
+#!/usr/bin/env bash
 
 # bump_version.sh (show|major|minor|patch|prerelease|build)
 
+set -o nounset
+set -o errexit
+set -o pipefail
+
 VERSION_FILE=trustymail/__init__.py
 
 HELP_INFORMATION="bump_version.sh (show|major|minor|patch|prerelease|build|finalize)"
 
 old_version=$(sed -n "s/^__version__ = '\(.*\)'$/\1/p" $VERSION_FILE)
 
-if [[ $# -ne 1 ]]
+if [ $# -ne 1 ]
 then
-   echo $HELP_INFORMATION
+   echo "$HELP_INFORMATION"
 else
     case $1 in
         major|minor|patch|prerelease|build)
             new_version=$(python -c "import semver; print(semver.bump_$1('$old_version'))")
-            echo Changing version from $old_version to $new_version
+            echo Changing version from "$old_version" to "$new_version"
             sed -i "s/$old_version/$new_version/" $VERSION_FILE
             git add $VERSION_FILE
-            git commit -m"Bumped version from $old_version to $new_version"
+            git commit -m"Bump version from $old_version to $new_version"
             git push
             ;;
         finalize)
             new_version=$(python -c "import semver; print(semver.finalize_version('$old_version'))")
-            echo Changing version from $old_version to $new_version
+            echo Changing version from "$old_version" to "$new_version"
             sed -i "s/$old_version/$new_version/" $VERSION_FILE
             git add $VERSION_FILE
-            git commit -m"Bumped version from $old_version to $new_version"
+            git commit -m"Finalize version from $old_version to $new_version"
             git push
             ;;
         show)
-            echo $old_version
+            echo "$old_version"
             ;;
         *)
-            echo $HELP_INFORMATION
+            echo "$HELP_INFORMATION"
             ;;
     esac
 fi
diff --git a/tag.sh b/tag.sh
index f72316d..e1f7447 100755
--- a/tag.sh
+++ b/tag.sh
@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+set -o nounset
+set -o errexit
+set -o pipefail
+
 version=$(./bump_version.sh show)
 
-git tag v$version && git push --tags
+git tag "v$version" && git push --tags
diff --git a/travis_scripts/build_docker_image.sh b/travis_scripts/build_docker_image.sh
index 13729ee..862f220 100644
--- a/travis_scripts/build_docker_image.sh
+++ b/travis_scripts/build_docker_image.sh
@@ -1,4 +1,8 @@
 #!/usr/bin/env bash
 
+set -o nounset
+set -o errexit
+set -o pipefail
+
 version=$(./bump_version.sh show)
-docker build -t ${IMAGE_NAME}:$version .
+docker build -t "$IMAGE_NAME":"$version" .
diff --git a/travis_scripts/deploy_to_docker_hub.sh b/travis_scripts/deploy_to_docker_hub.sh
index 1cb991e..2be3e20 100644
--- a/travis_scripts/deploy_to_docker_hub.sh
+++ b/travis_scripts/deploy_to_docker_hub.sh
@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+set -o nounset
+set -o errexit
+set -o pipefail
+
 echo "$DOCKER_PW" | docker login -u "$DOCKER_USER" --password-stdin
 version=$(./bump_version.sh show)
-docker push "$IMAGE_NAME":$version
+docker push "$IMAGE_NAME":"$version"