From a30883a7b8227c0687bae6de3626c2b220e746c5 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 12 Aug 2022 19:06:50 -0300 Subject: mv etc/bash/check.sh etc/sh/check.sh --- etc/bash/check.sh | 74 ---------------------------------------------------- etc/sh/check.sh | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 74 deletions(-) delete mode 100755 etc/bash/check.sh create mode 100755 etc/sh/check.sh diff --git a/etc/bash/check.sh b/etc/bash/check.sh deleted file mode 100755 index 5c410c8..0000000 --- a/etc/bash/check.sh +++ /dev/null @@ -1,74 +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"/bash/rc \ - "$XDG_CONFIG_HOME"/bash/vcs-ps1.sh \ - "$XDG_CONFIG_HOME"/bash/check.sh \ - "$XDG_CONFIG_HOME"/bash/privrc.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 diff --git a/etc/sh/check.sh b/etc/sh/check.sh new file mode 100755 index 0000000..102fcd0 --- /dev/null +++ b/etc/sh/check.sh @@ -0,0 +1,77 @@ +#!/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"/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 -- cgit v1.2.3