Merge pull request #4154 from Joshua-Anderson/add-shellcheck-mesos

test(mesos): run shell scripts through shellcheck

Author: mboersma

mesos/Makefile

@@ -17,6 +17,8 @@ COMPONENT = $(notdir $(repo_path))
 GO_PACKAGES = pkg/boot pkg/confd pkg/etcd pkg/fleet pkg/log pkg/net pkg/os pkg/types
 GO_PACKAGES_REPO_PATH = $(addprefix $(repo_path)/,$(GO_PACKAGES))
 
+SHELL_SCRIPTS = $(shell find "." -name '*.sh')
+
 MASTER_IMAGE = $(IMAGE_PREFIX)mesos-master:$(BUILD_TAG)
 MASTER_DEV_IMAGE = $(REGISTRY)$(MASTER_IMAGE)
 MARATHON_IMAGE = $(IMAGE_PREFIX)mesos-marathon:$(BUILD_TAG)
@@ -129,3 +131,4 @@ test-style:
 	@for i in $(addsuffix /...,$(GO_PACKAGES)); do \
 		$(GOLINT) $$i; \
 	done
+	shellcheck $(SHELL_SCRIPTS)

mesos/build-marathon-jar.sh

@@ -10,6 +10,7 @@ if [[ -z $DOCKER_BUILD ]]; then
   exit 1
 fi
 
+# shellcheck disable=SC2034
 DEBIAN_FRONTEND=noninteractive
 
 apt-get update && apt-get install --no-install-recommends -y \
@@ -20,12 +21,14 @@ apt-get update && apt-get install --no-install-recommends -y \
 curl -SsL -O http://dl.bintray.com/sbt/debian/sbt-0.13.5.deb && \
   dpkg -i sbt-0.13.5.deb
 
-curl -sSL https://github.com/mesosphere/marathon/archive/v$MARATHON_VERSION.tar.gz | tar -xzf - -C /opt
-ln -s /opt/marathon-$MARATHON_VERSION /app
-ln -s /opt/marathon-$MARATHON_VERSION /marathon
+curl -sSL "https://github.com/mesosphere/marathon/archive/v$MARATHON_VERSION.tar.gz" | tar -xzf - -C /opt
+ln -s "/opt/marathon-$MARATHON_VERSION" /app
+ln -s "/opt/marathon-$MARATHON_VERSION" /marathon
 
 cd /app
 
+# Word splitting wanted in this situation.
+# shellcheck disable=SC2046
 sbt assembly && \
   mv $(find target -name 'marathon-assembly-*.jar' | sort | tail -1) ./ && \
   rm -rf target/* ~/.sbt ~/.ivy2 && \
@@ -35,4 +38,3 @@ sbt assembly && \
 apt-get clean -y && \
   rm -rf /tmp/* /var/tmp/* && \
   rm -rf /var/lib/apt/lists/*
-

mesos/build-marathon.sh

@@ -16,16 +16,15 @@ cd /tmp
 
 mkdir -p /opt
 
-curl -sSL https://github.com/mesosphere/marathon/archive/v$MARATHON_VERSION.tar.gz | tar -xzf - -C /opt
-ln -s /opt/marathon-$MARATHON_VERSION /app
-ln -s /opt/marathon-$MARATHON_VERSION /marathon
+curl -sSL "https://github.com/mesosphere/marathon/archive/v$MARATHON_VERSION.tar.gz" | tar -xzf - -C /opt
+ln -s "/opt/marathon-$MARATHON_VERSION" /app
+ln -s "/opt/marathon-$MARATHON_VERSION" /marathon
 
-mkdir -p /opt/marathon-$MARATHON_VERSION/target
-ln -s /marathon-assembly.jar /opt/marathon-$MARATHON_VERSION/target/marathon-assembly-$MARATHON_VERSION.jar
+mkdir -p "/opt/marathon-$MARATHON_VERSION/target"
+ln -s "/marathon-assembly.jar /opt/marathon-$MARATHON_VERSION/target/marathon-assembly-$MARATHON_VERSION.jar"
 
 apt-get autoremove -y --purge && \
   apt-get clean -y && \
   rm -Rf /usr/share/man /usr/share/doc && \
   rm -rf /tmp/* /var/tmp/* && \
   rm -rf /var/lib/apt/lists/*
-

mesos/build-mesos.sh

@@ -10,18 +10,18 @@ if [[ -z $DOCKER_BUILD ]]; then
   exit 1
 fi
 
+# shellcheck disable=SC2034
 DEBIAN_FRONTEND=noninteractive
 
 echo "deb http://repos.mesosphere.io/ubuntu/ trusty main" > /etc/apt/sources.list.d/mesosphere.list
 
 apt-key adv --keyserver keyserver.ubuntu.com --recv E56151BF
 
 apt-get update && \
-  apt-get -y install mesos=$MESOS
+  apt-get -y install mesos="$MESOS"
 
 apt-get autoremove -y --purge && \
   apt-get clean -y && \
   rm -Rf /usr/share/man /usr/share/doc && \
   rm -rf /tmp/* /var/tmp/* && \
   rm -rf /var/lib/apt/lists/*
-

mesos/zookeeper/build.sh

@@ -3,7 +3,7 @@
 # fail on any command exiting non-zero
 set -eo pipefail
 
-if [[ -z $DOCKER_BUILD ]]; then
+if [ -z "$DOCKER_BUILD" ]; then
   echo
   echo "Note: this script is intended for use by the Dockerfile and not as a way to build zoopeeper locally"
   echo