Meta: Print commit hook scripts via function

script/lint-ci.sh

@@ -7,6 +7,9 @@
 
 b="$(tput bold)"
 red="$(tput setf 4)"
+yellow="$(tput setf 6)"
+blue="$(tput setf 1)"
+green="$(tput setf 2)"
 n="$(tput sgr0)"
 
 if [ ! -d ".git" ]; then
@@ -14,16 +17,28 @@ if [ ! -d ".git" ]; then
 	exit 1
 fi
 
+# Temporary clear unstaged files from the repository to pass the diff checker
+unstaged="$(git --no-pager diff --name-only)"
+if [ -n "$unstaged" ]; then
+	patch=".git/patch-$(date +%s)"
+	echo "[${yellow}WARNING${n}]: Stashing unstaged files to $patch"
+	git --no-pager diff > "$patch"
+	git restore .
+
+	remove() {
+		git apply "$patch"
+		rm -rf "${patch:?}"
+		echo "[${blue}INFO${n}]: Restored changes from $patch"
+	}
+	trap remove EXIT HUP INT TERM
+fi
+
 # Get the path from the project root to the script
 subDir="$(dirname -- "$0")"
 
 # Get all files staged for commit
 files="$(git --no-pager diff --cached --name-only)"
 
-green="$(tput setf 2)"
-red="$(tput setf 4)"
-nc="$(tput sgr0)"
-
 failures=0
 
 linters="
@@ -33,9 +48,9 @@ lint-shell-script.sh
 for linter in $linters; do
 	echo "Running $subDir/$linter"
 	if "$subDir/$linter" "$files"; then
-		echo "[${green}PASS${nc}]: $subDir/$linter"
+		echo "[${green}PASS${n}]: $subDir/$linter"
 	else
-		echo "[${red}FAIL${nc}]: $subDir/$linter"
+		echo "[${red}FAIL${n}]: $subDir/$linter"
 		failures=$(( failures + 1 ))
 	fi
 done
@@ -43,9 +58,9 @@ done
 echo "Running $subDir/lint-clang-format.sh"
 # shellcheck disable=SC2086
 if "$subDir/lint-clang-format.sh" "$files" && git diff --exit-code $files; then
-    echo "[${green}PASS${nc}]: $subDir/lint-clang-format.sh"
+    echo "[${green}PASS${n}]: $subDir/lint-clang-format.sh"
 else
-    echo "[${red}FAIL${nc}]: $subDir/lint-clang-format.sh"
+    echo "[${red}FAIL${n}]: $subDir/lint-clang-format.sh"
 	failures=$(( failures + 1 ))
 fi
 

script/lint-clang-format.sh

@@ -5,13 +5,17 @@
 
 # ------------------------------------------
 
+error() {
 	b="$(tput bold)"
 	red="$(tput setf 4)"
 	n="$(tput sgr0)"
 
-if [ ! -d ".git" ]; then
-   echo "${b}${red}Error:${n} please run this script from the project root" >&2
+	echo "${b}${red}Error:${n} $1" >&2
 	exit 1
+}
+
+if [ ! -d ".git" ]; then
+	error "please run this script from the project root"
 fi
 
 formatter=false
@@ -20,13 +24,11 @@ if command -v clang-format-11 >/dev/null 2>&1; then
 elif command -v clang-format >/dev/null 2>&1; then
 	formatter="clang-format"
 	if ! "$formatter" --version | awk '{ if (substr($NF, 1, index($NF, ".") - 1) < 11) exit 1; }'; then
-		echo "You are using '$("${CLANG_FORMAT}" --version)', which appears to not be clang-format 11 or later."
-		exit 1
+		error "you are using '$("${formatter}" --version)', which appears to not be clang-format 11 or later."
 	fi
 else
-	echo "clang-format-11 is not available, but C++ files need linting!"
-	echo "Either skip this script, or install clang-format-11."
-	exit 1
+	error "clang-format-11 is not available, but C++ files need linting!
+Either skip this script, or install clang-format-11."
 fi
 
 files="${1:-$(git --no-pager diff --cached --name-only)}"

script/lint-shell-script.sh

@@ -5,19 +5,22 @@
 
 # ------------------------------------------
 
+error() {
 	b="$(tput bold)"
 	red="$(tput setf 4)"
 	n="$(tput sgr0)"
 
-if [ ! -d ".git" ]; then
-   echo "${b}${red}Error:${n} please run this script from the project root" >&2
+	echo "${b}${red}Error:${n} $1" >&2
 	exit 1
+}
+
+if [ ! -d ".git" ]; then
+	error "please run this script from the project root"
 fi
 
 if ! command -v shellcheck > /dev/null 2>&1; then
-	echo "shellcheck is not available, but shell script files need linting!"
-	echo "Either skip this script, or install shellcheck."
-	exit 1
+	error "shellcheck is not available, but shell-script files need linting!
+Either skip this script, or install shellcheck."
 fi
 
 files="${1:-$(git --no-pager diff --cached --name-only)}"