From b4e2541e50df78a79d250139ab5725cb1d7619b3 Mon Sep 17 00:00:00 2001 From: Andrew Rogers Date: Wed, 21 Jun 2023 23:51:03 -0500 Subject: [PATCH] logging.bash: Add dedcat and excat helpers --- logging.bash | 2 ++ scripts/hashwalker | 2 +- scripts/include_info | 5 ++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/logging.bash b/logging.bash index b43a953..62a5d9b 100644 --- a/logging.bash +++ b/logging.bash @@ -1,3 +1,5 @@ errcho() { (>&2 echo $@); } errcat() { (>&2 cat <<<"$@"); } +dedcat() { (>&2 cat <<<"$@"); exit 1; } +excat() { (>&2 cat <<<"$@"); exit 0; } die() { errcho $@; exit 1; } diff --git a/scripts/hashwalker b/scripts/hashwalker index da14a89..20e4609 100755 --- a/scripts/hashwalker +++ b/scripts/hashwalker @@ -14,7 +14,7 @@ Usage: $0 BRANCH_A UPSTREAM_BRANCH [START_REFSPEC] Note: Commit hashes are walked along UPSTREAM_BRANCH. EOUSAGE -[ -z "$1" -o -z "$2" ] && errcat "$usage" && exit 1 +[ -z "$1" -o -z "$2" ] && dedcat "$usage" branch_a="$1" upstream_branch="$2" diff --git a/scripts/include_info b/scripts/include_info index e045095..fb928bd 100755 --- a/scripts/include_info +++ b/scripts/include_info @@ -41,7 +41,7 @@ get-incl() { cc=${CC:-cc} cxx=${CXX:-cxx} -[ -z "$1" ] && errcat "$usage" && exit 1 +[ -z "$1" ] && dedcat "$usage" case "$1" in 'clang') ;& @@ -72,8 +72,7 @@ while getopts 'cpP' opt; do sort -u <<<$(get-both) ;; *) - errcat "$usage" - exit 1 + dedcat "$usage" ;; esac done