From fffbd93f121cea5f4a2d762d46dcd6219b2df37b Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Tue, 12 Mar 2024 11:28:55 +0000 Subject: [PATCH] genprotimg/samples/check_hostkeydoc: improve argument parsing + use `getopts` POSIX builtin instead of external program + improve error reporting + support white spaces in the script name Reviewed-by: Steffen Eiden Reviewed-by: Christoph Schlameuss Signed-off-by: Marc Hartmayer Signed-off-by: Steffen Eiden --- genprotimg/samples/check_hostkeydoc | 34 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/genprotimg/samples/check_hostkeydoc b/genprotimg/samples/check_hostkeydoc index 82965315..00eff0a7 100755 --- a/genprotimg/samples/check_hostkeydoc +++ b/genprotimg/samples/check_hostkeydoc @@ -229,24 +229,22 @@ CRL_FILE= CA_FILE= CHECK_DEFAULT_ISSUER=1 -args=$(getopt -qu "dr:c:h" $*) -if [ $? = 0 ] -then - set -- $args - while [ $1 != "" ] - do - case $1 in - -d) CHECK_DEFAULT_ISSUER=0; shift;; - -r) CRL_FILE=$2; shift 2;; - -c) CA_FILE=$2; shift 2;; - -h) usage $0; exit 0;; - --) shift; break;; - esac - done -else - usage $0 >&2 - exit 1 -fi +while getopts 'dr:c:h' opt; do + case $opt in + d) CHECK_DEFAULT_ISSUER=0 ;; + r) CRL_FILE=$OPTARG ;; + c) CA_FILE=$OPTARG ;; + h) + usage "$0" + exit 0 + ;; + ?) + usage "$0" + exit 1 + ;; + esac +done +shift "$((OPTIND - 1))" if [ $# -ne 2 ] then