diff --git a/Dockerfile b/Dockerfile index db4f16072..9d6b96fbc 100644 --- a/Dockerfile +++ b/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} \ diff --git a/Makefile b/Makefile index 811789285..6781ac74e 100644 --- a/Makefile +++ b/Makefile @@ -133,7 +133,6 @@ clean: validate: script/validate-gofmt - script/validate-shfmt go vet $(allpackages) ci: validate localtest diff --git a/script/validate-shfmt b/script/validate-shfmt deleted file mode 100755 index 8f45fe3cd..000000000 --- a/script/validate-shfmt +++ /dev/null @@ -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