From 4b41b1af58b10ae6b7ce1ba0fa8475cec4e4405e Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Mon, 15 Aug 2022 14:47:45 -0300
Subject: mv etc/sh/check.sh bin/check: Also use generic ShellCommand command

---
 bin/check       | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 etc/sh/check.sh | 78 ---------------------------------------------------------
 etc/sh/rc       |  1 -
 3 files changed, 76 insertions(+), 79 deletions(-)
 create mode 100755 bin/check
 delete mode 100755 etc/sh/check.sh

diff --git a/bin/check b/bin/check
new file mode 100755
index 0000000..4663bf3
--- /dev/null
+++ b/bin/check
@@ -0,0 +1,76 @@
+#!/bin/sh
+set -eu
+
+usage() {
+	cat <<-'EOF'
+		Usage:
+		  check.sh
+		  check.sh -h
+	EOF
+}
+
+help() {
+	cat <<-'EOF'
+
+		Options:
+		  -h, --help    show this message
+	EOF
+}
+
+for flag in "$@"; do
+	case "$flag" in
+		--)
+			break
+			;;
+		--help)
+			usage
+			help
+			exit
+			;;
+		*)
+			;;
+	esac
+done
+
+while getopts 'h' flag; do
+	case "$flag" in
+		h)
+			usage
+			help
+			exit
+			;;
+		*)
+			usage >&2
+			exit 2
+			;;
+	esac
+done
+shift $((OPTIND - 1))
+
+cd -- "$(dirname -- "$0")"
+cd -- "$(git rev-parse --show-toplevel)"
+
+
+git ls-files |
+	xargs awk 'FNR==1 && /^#!\/bin\/sh$/ { print FILENAME }' |
+	xargs shellcheck -x
+
+if git grep FIXME -- ":(exclude)$0"; then
+	printf 'Leftover FIXME markers\n' >&2
+	exit 1
+fi
+
+if ! git diff --quiet || ! git diff --quiet --staged; then
+	printf 'Dirty tilde repository.\n' >&2
+	exit 1
+fi
+
+PRIV="$XDG_CONFIG_HOME/../var/lib/private/tilde"
+if ! git -C "$PRIV" diff --quiet || ! git -C "$PRIV" diff --quiet --staged; then
+	printf 'Dirty private tilde repository.\n' >&2
+	exit 1
+fi
+
+# FIXME:
+# verify that the expiry date on the GPG key is greater than 1 year
+# assert git pushed
diff --git a/etc/sh/check.sh b/etc/sh/check.sh
deleted file mode 100755
index 07e9e66..0000000
--- a/etc/sh/check.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-set -eu
-
-usage() {
-	cat <<-'EOF'
-		Usage:
-		  check.sh
-		  check.sh -h
-	EOF
-}
-
-help() {
-	cat <<-'EOF'
-
-		Options:
-		  -h, --help    show this message
-	EOF
-}
-
-for flag in "$@"; do
-	case "$flag" in
-		--)
-			break
-			;;
-		--help)
-			usage
-			help
-			exit
-			;;
-		*)
-			;;
-	esac
-done
-
-while getopts 'h' flag; do
-	case "$flag" in
-		h)
-			usage
-			help
-			exit
-			;;
-		*)
-			usage >&2
-			exit 2
-			;;
-	esac
-done
-shift $((OPTIND - 1))
-
-cd -- "$(dirname -- "$0")"
-cd -- "$(git rev-parse --show-toplevel)"
-
-shellcheck -xe 1090,1091 \
-	"$XDG_CONFIG_HOME"/sh/rc          \
-	"$XDG_CONFIG_HOME"/sh/vcs-ps1.sh  \
-	"$XDG_CONFIG_HOME"/sh/check.sh    \
-	"$XDG_CONFIG_HOME"/sh/privrc.sh   \
-	"$XDG_CONFIG_HOME"/sh/cronjob.sh  \
-	"$XDG_CONFIG_HOME"/notmuch/default/hooks/post-new
-
-if git grep FIXME -- ":(exclude)$XDG_CONFIG_HOME/bash/check.sh"; then
-	printf 'Leftover FIXME markers\n' >&2
-	exit 1
-fi
-
-if ! git diff --quiet || ! git diff --quiet --staged; then
-	printf 'Dirty tilde repository.\n' >&2
-	exit 1
-fi
-
-PRIV="$XDG_CONFIG_HOME/../var/lib/private/tilde"
-if ! git -C "$PRIV" diff --quiet || ! git -C "$PRIV" diff --quiet --staged; then
-	printf 'Dirty private tilde repository.\n' >&2
-	exit 1
-fi
-
-# FIXME:
-# verify that the expiry date on the GPG key is greater than 1 year
diff --git a/etc/sh/rc b/etc/sh/rc
index e1eb992..33b01bc 100644
--- a/etc/sh/rc
+++ b/etc/sh/rc
@@ -122,7 +122,6 @@ alias mm='msmtp-queue -r'
 alias s='vcs_status'
 alias d='vcs_diff'
 alias ds='vcs_diff_staged'
-alias check='sh "$XDG_CONFIG_HOME"/sh/check.sh'
 alias tpd='cd "$(mkdtemp)"'
 
 alias l='ls -lahF --color'
-- 
cgit v1.2.3