diff options
author | baude <bbaude@redhat.com> | 2017-12-12 12:40:20 -0600 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-12-13 20:52:51 +0000 |
commit | 61f606e192ad67b4819a909a6f1b18c41e33db2d (patch) | |
tree | 72ef78b74fc20661d1b76c1f64631d6f29d4b5c0 | |
parent | 4db49476616b706902c647995467adbb0a044b24 (diff) | |
download | podman-61f606e192ad67b4819a909a6f1b18c41e33db2d.tar.gz podman-61f606e192ad67b4819a909a6f1b18c41e33db2d.tar.bz2 podman-61f606e192ad67b4819a909a6f1b18c41e33db2d.zip |
Add fix_gofmt target
fix_gofmt will run gofmt -s -w on files that need to be
formatted. Useful for developers prior to checking code
in.
Signed-off-by: baude <bbaude@redhat.com>
Closes: #125
Approved by: baude
-rw-r--r-- | Makefile | 3 | ||||
-rwxr-xr-x | hack/verify-gofmt.sh | 24 |
2 files changed, 23 insertions, 4 deletions
@@ -72,6 +72,9 @@ lint: .gopathok gofmt: @./hack/verify-gofmt.sh +fix_gofmt: + @./hack/verify-gofmt.sh -f + conmon: $(MAKE) -C $@ diff --git a/hack/verify-gofmt.sh b/hack/verify-gofmt.sh index a2efbe1df..c11ab3adb 100755 --- a/hack/verify-gofmt.sh +++ b/hack/verify-gofmt.sh @@ -12,11 +12,27 @@ find_files() { \) -name '*.go' \ -not \( -wholename './_output/*' \) } - +FIX=0 GOFMT="gofmt -s" bad_files=$(find_files | xargs $GOFMT -l) + +while getopts "f?:" opt; do + case "$opt" in + f) FIX=1 + ;; + esac +done + if [[ -n "${bad_files}" ]]; then - echo "!!! '$GOFMT' needs to be run on the following files: " - echo "${bad_files}" - exit 1 + if (($FIX == 1)) ; then + echo "Correcting the following files:" + echo "${bad_files}" + while read -r go_file; do + gofmt -s -w $go_file + done <<< "${bad_files}" + else + echo "!!! '$GOFMT' needs to be run on the following files: " + echo "${bad_files}" + exit 1 + fi fi |