From 63dd27a98b9710b40d73f3a68fcf39881e27809e Mon Sep 17 00:00:00 2001 From: Richard T Bonhomme Date: Thu, 28 Apr 2022 22:47:03 +0100 Subject: [PATCH] Improve/simplify Fatal error: Missing *expected* "$val" to "$opt" Fatal errors should be precisely coded, not "obfuscated". Signed-off-by: Richard T Bonhomme --- easyrsa3/easyrsa | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa index db44b06..c4d8985 100755 --- a/easyrsa3/easyrsa +++ b/easyrsa3/easyrsa @@ -3242,7 +3242,13 @@ while :; do # Separate option from value: opt="${1%%=*}" val="${1#*=}" - empty_ok="" # Empty values are not allowed unless excepted + + # Empty values are not allowed unless expected + unset -v is_empty empty_ok + # eg: '--batch' + [ "$opt" = "$val" ] && is_empty=1 + # eg: '--pki-dir=' + [ "$val" ] || is_empty=1 case "$opt" in --days) @@ -3326,8 +3332,8 @@ subjectAltName = $val" ;; esac # fatal error when no value was provided - if [ ! $empty_ok ] && { [ "$val" = "$1" ] || [ -z "$val" ]; }; then - die "Missing value to option: $opt" + if [ "$is_empty" ]; then + [ "$empty_ok" ] || die "Missing value to option: $opt" fi shift