From fa11769b7bf89d82d664cf517f003f812e219728 Mon Sep 17 00:00:00 2001 From: "Lance R. Vick" Date: Mon, 7 Dec 2020 22:01:17 -0800 Subject: [PATCH] swap sed for awk for fingerprint match as MacOS sed was frozen in 2005 and parses regex differently --- sig | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sig b/sig index fbd8638..8353d8b 100755 --- a/sig +++ b/sig @@ -290,7 +290,7 @@ verify_git(){ git_fp=$( \ git verify-tag --raw "$tag" 2>&1 \ | grep VALIDSIG \ - | sed 's/.*VALIDSIG \([A-Z0-9]\+\).*/\1/g' \ + | awk '{print $3}' \ ) fp=$(get_primary_fp "$git_fp") uid=$( get_uid "${fp}" ) @@ -497,7 +497,7 @@ cmd_fetch() { } cmd_add(){ - local opts method="default" push=0 + local opts method="" push=0 opts="$(getopt -o m:p:: -l method:push:: -n "$PROGRAM" -- "$@")" eval set -- "$opts" while true; do case $1 in @@ -506,16 +506,16 @@ cmd_add(){ --) shift; break ;; esac done case $method in - default) + detached) sign_detached ;; + git) sign_tag "$push" ;; + *) + [ ! -z "$push" ] || cmd_usage if [ -d '.git' ]; then sign_tag "$push" else sign_detached fi - ;; - detached) sign_detached ;; - git) sign_tag "$push" ;; - *) cmd_usage ;; + ;; esac }