Fixed arg processing and go-fmt error checking

Author: TekWizely

README.md

@@ -283,7 +283,7 @@ Implements a Go pretty-printer (like `go-fmt`) that also adds zero-value return
 
 | Hook ID      | Description
 |--------------|------------
-| `go-returns` | Run `'goreturns -l -p -d [$ARGS] $FILE'` for each staged .go file
+| `go-returns` | Run `'goreturns -l -d [$ARGS] $FILE'` for each staged .go file
 
 ##### Install
 ```

go-build-mod.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+cmd=(go build)
+
 export GO111MODULE=on
 
 # Walks up the file path looking for go.mod
@@ -22,26 +24,35 @@ function find_module_roots() {
 }
 
 FILES=()
-
-# Build file list while looking for optional argument marker
+# Build potential options list (may just be files)
 #
 while [ $# -gt 0 ] && [ "$1" != "-" ] && [ "$1" != "--" ]; do
 	FILES+=("$1")
 	shift
 done
 
-# Remove argument marker if present
+OPTIONS=()
+# If '--' next, then files = options
 #
 if [ $# -gt 0 ]; then
 	if [ "$1" == "-" ] || [ "$1" == "--" ]; then
 		shift
+		OPTIONS=("${FILES[@]}")
+		FILES=()
 	fi
 fi
 
+# Any remaining items are files
+#
+while [ $# -gt 0 ]; do
+	FILES+=("$1")
+	shift
+done
+
 errCode=0
-for sub in $(find_module_roots "${FILES}" | sort -u) ; do
+for sub in $(find_module_roots "${FILES[@]}" | sort -u) ; do
 	pushd "${sub}" >/dev/null
-	go build "$@" ./...
+	"${cmd[@]}" "${OPTIONS[@]}" ./...
 	if [ $? -ne 0 ]; then
 		errCode=1
 	fi

go-build-pkg.sh

@@ -1,27 +1,38 @@
 #!/usr/bin/env bash
 
+cmd=(go build)
+
 export GO111MODULE=off
 
 FILES=()
-
-# Build file list while looking for optional argument marker
+# Build potential options list (may just be files)
 #
 while [ $# -gt 0 ] && [ "$1" != "-" ] && [ "$1" != "--" ]; do
 	FILES+=("$1")
 	shift
 done
 
-# Remove argument marker if present
+OPTIONS=()
+# If '--' next, then files = options
 #
 if [ $# -gt 0 ]; then
 	if [ "$1" == "-" ] || [ "$1" == "--" ]; then
 		shift
+		OPTIONS=("${FILES[@]}")
+		FILES=()
 	fi
 fi
 
+# Any remaining items are files
+#
+while [ $# -gt 0 ]; do
+	FILES+=("$1")
+	shift
+done
+
 errCode=0
-for sub in $(echo "${FILES}" | xargs -n1 dirname | sort -u); do
-	go build "$@" "./${sub}"
+for sub in $(echo "${FILES[@]}" | xargs -n1 dirname | sort -u); do
+	"${cmd[@]}" "${OPTIONS[@]}" "./${sub}"
 	if [ $? -ne 0 ]; then
 		errCode=1
 	fi

go-build-repo-mod.sh

@@ -1,22 +1,23 @@
 #!/usr/bin/env bash
 
+cmd=(go build)
+
 export GO111MODULE=on
 
-# '-' and '--' are optional argument markers for parity with file scripts
-# Remove them if present
+OPTIONS=()
+# Build options list, ignoring '-', '--', and anything after
 #
-if [ $# -gt 0 ]; then
-	if [ "$1" == "-" ] || [ "$1" == "--" ]; then
-		shift
-	fi
-fi
+while [ $# -gt 0 ] && [ "$1" != "-" ] && [ "$1" != "--" ]; do
+	OPTIONS+=("$1")
+	shift
+done
 
 errCode=0
 # Assume parent folder of go.mod is module root folder
 #
 for sub in $(find . -name go.mod | xargs -n1 dirname | sort -u) ; do
 	pushd "${sub}" >/dev/null
-	go build "$@" ./...
+	"${cmd[@]}" "${OPTIONS[@]}" ./...
 	if [ $? -ne 0 ]; then
 		errCode=1
 	fi

go-build-repo-pkg.sh

@@ -1,15 +1,16 @@
 #!/usr/bin/env bash
 set -e
 
+cmd=(go build)
+
 export GO111MODULE=off
 
-# '-' and '--' are optional argument markers for parity with file scripts
-# Remove them if present
+OPTIONS=()
+# Build options list, ignoring '-', '--', and anything after
 #
-if [ $# -gt 0 ]; then
-	if [ "$1" == "-" ] || [ "$1" == "--" ]; then
-		shift
-	fi
-fi
+while [ $# -gt 0 ] && [ "$1" != "-" ] && [ "$1" != "--" ]; do
+	OPTIONS+=("$1")
+	shift
+done
 
-go build "$@" ./...
+"${cmd[@]}" "${OPTIONS[@]}" ./...

go-critic.sh

@@ -1,25 +1,36 @@
 #!/usr/bin/env bash
 
-FILES=()
+cmd=(gocritic check)
 
-# Build file list while looking for optional argument marker
+FILES=()
+# Build potential options list (may just be files)
 #
 while [ $# -gt 0 ] && [ "$1" != "-" ] && [ "$1" != "--" ]; do
 	FILES+=("$1")
 	shift
 done
 
-# Remove argument marker if present
+OPTIONS=()
+# If '--' next, then files = options
 #
 if [ $# -gt 0 ]; then
 	if [ "$1" == "-" ] || [ "$1" == "--" ]; then
 		shift
+		OPTIONS=("${FILES[@]}")
+		FILES=()
 	fi
 fi
 
+# Any remaining items are files
+#
+while [ $# -gt 0 ]; do
+	FILES+=("$1")
+	shift
+done
+
 errCode=0
-for file in "${FILES}"; do
-	gocritic check "$@" "${file}"
+for file in "${FILES[@]}"; do
+	"${cmd[@]}" "${OPTIONS[@]}" "${file}"
 	if [ $? -ne 0 ]; then
 		errCode=1
 	fi

go-fmt.sh

@@ -1,26 +1,38 @@
 #!/usr/bin/env bash
 
-FILES=()
+cmd=(gofmt -l -d)
 
-# Build file list while looking for optional argument marker
+FILES=()
+# Build potential options list (may just be files)
 #
 while [ $# -gt 0 ] && [ "$1" != "-" ] && [ "$1" != "--" ]; do
 	FILES+=("$1")
 	shift
 done
 
-# Remove argument marker if present
+OPTIONS=()
+# If '--' next, then files = options
 #
 if [ $# -gt 0 ]; then
 	if [ "$1" == "-" ] || [ "$1" == "--" ]; then
 		shift
+		OPTIONS=("${FILES[@]}")
+		FILES=()
 	fi
 fi
 
+# Any remaining items are files
+#
+while [ $# -gt 0 ]; do
+	FILES+=("$1")
+	shift
+done
+
 errCode=0
-for file in "${FILES}"; do
-	gofmt -l -d "$@" "${file}"
-	if [ $? -ne 0 ]; then
+for file in "${FILES[@]}"; do
+	output=$("${cmd[@]}" "${OPTIONS[@]}" "${file}" 2>&1)
+	if [ ! -z "${output}" ]; then
+		echo -n "${output}"
 		errCode=1
 	fi
 done

go-imports.sh

@@ -1,26 +1,38 @@
 #!/usr/bin/env bash
 
-FILES=()
+cmd=(goimports -l -d)
 
-# Build file list while looking for optional argument marker
+FILES=()
+# Build potential options list (may just be files)
 #
 while [ $# -gt 0 ] && [ "$1" != "-" ] && [ "$1" != "--" ]; do
 	FILES+=("$1")
 	shift
 done
 
-# Remove argument marker if present
+OPTIONS=()
+# If '--' next, then files = options
 #
 if [ $# -gt 0 ]; then
 	if [ "$1" == "-" ] || [ "$1" == "--" ]; then
 		shift
+		OPTIONS=("${FILES[@]}")
+		FILES=()
 	fi
 fi
 
+# Any remaining items are files
+#
+while [ $# -gt 0 ]; do
+	FILES+=("$1")
+	shift
+done
+
 errCode=0
-for file in "${FILES}"; do
-	goimports -l -d "$@" "${file}"
-	if [ $? -ne 0 ]; then
+for file in "${FILES[@]}"; do
+	output=$("${cmd[@]}" "${OPTIONS[@]}" "${file}" 2>&1)
+	if [ ! -z "${output}" ]; then
+		echo -n "${output}"
 		errCode=1
 	fi
 done

go-lint.sh

@@ -1,25 +1,36 @@
 #!/usr/bin/env bash
 
-FILES=()
+cmd=(golint -set_exit_status)
 
-# Build file list while looking for optional argument marker
+FILES=()
+# Build potential options list (may just be files)
 #
 while [ $# -gt 0 ] && [ "$1" != "-" ] && [ "$1" != "--" ]; do
 	FILES+=("$1")
 	shift
 done
 
-# Remove argument marker if present
+OPTIONS=()
+# If '--' next, then files = options
 #
 if [ $# -gt 0 ]; then
 	if [ "$1" == "-" ] || [ "$1" == "--" ]; then
 		shift
+		OPTIONS=("${FILES[@]}")
+		FILES=()
 	fi
 fi
 
+# Any remaining items are files
+#
+while [ $# -gt 0 ]; do
+	FILES+=("$1")
+	shift
+done
+
 errCode=0
-for file in "${FILES}"; do
-	golint -set_exit_status "$@" "${file}"
+for file in "${FILES[@]}"; do
+	"${cmd[@]}" "${OPTIONS[@]}" "${file}"
 	if [ $? -ne 0 ]; then
 		errCode=1
 	fi

go-returns.sh

@@ -1,26 +1,38 @@
 #!/usr/bin/env bash
 
-FILES=()
+cmd=(goreturns -l -d)
 
-# Build file list while looking for optional argument marker
+FILES=()
+# Build potential options list (may just be files)
 #
 while [ $# -gt 0 ] && [ "$1" != "-" ] && [ "$1" != "--" ]; do
 	FILES+=("$1")
 	shift
 done
 
-# Remove argument marker if present
+OPTIONS=()
+# If '--' next, then files = options
 #
 if [ $# -gt 0 ]; then
 	if [ "$1" == "-" ] || [ "$1" == "--" ]; then
 		shift
+		OPTIONS=("${FILES[@]}")
+		FILES=()
 	fi
 fi
 
+# Any remaining items are files
+#
+while [ $# -gt 0 ]; do
+	FILES+=("$1")
+	shift
+done
+
 errCode=0
-for file in "${FILES}"; do
-	goreturns -l -p -d "$@" "${file}"
-	if [ $? -ne 0 ]; then
+for file in "${FILES[@]}"; do
+	output=$("${cmd[@]}" "${OPTIONS[@]}" "${file}" 2>&1)
+	if [ ! -z "${output}" ]; then
+		echo -n "${output}"
 		errCode=1
 	fi
 done