Merge pull request #1510 from crosbymichael/remove-shfmt

Remove shfmt

Dockerfile

@@ -47,15 +47,6 @@ RUN mkdir -p /usr/src/criu \
     && make install-criu \
     && rm -rf /usr/src/criu
 
-# install shfmt
-RUN mkdir -p /go/src/github.com/mvdan \
-    && cd /go/src/github.com/mvdan \
-    && git clone https://github.com/mvdan/sh \
-    && cd sh \
-    && git checkout -f v0.4.0 \
-    && go install ./cmd/shfmt \
-    && rm -rf /go/src/github.com/mvdan
-
 # setup a playground for us to spawn containers in
 ENV ROOTFS /busybox
 RUN mkdir -p ${ROOTFS} \

Makefile

@@ -133,7 +133,6 @@ clean:
 
 validate:
 	script/validate-gofmt
-	script/validate-shfmt
 	go vet $(allpackages)
 
 ci: validate localtest

script/validate-shfmt

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-badFiles=()
-while read f; do
-	badFiles+=("$f")
-done < <(shfmt -l . | grep -v vendor/)
-
-if [ ${#badFiles[@]} -eq 0 ]; then
-	echo 'Congratulations!  All shell source files are properly formatted.'
-else
-	{
-		echo "These files are not properly shfmt'd:"
-		for f in "${badFiles[@]}"; do
-			echo " - $f"
-		done
-		echo
-		echo 'Please reformat the above files using "shfmt -w" and commit the result.'
-		echo
-	} >&2
-	false
-fi