From 3915135275254210374e9a6e5f4faf94290b5264 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Mon, 12 Sep 2022 19:16:08 +0200 Subject: [PATCH] rpmbuild: Simplify cmdline checks Signed-off-by: Michal Berger Change-Id: I7b7e4118e3573d3d1ad83a50d4a980bd69c8c0f4 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14480 Tested-by: SPDK CI Jenkins Reviewed-by: Reviewed-by: Tomasz Zawadzki Reviewed-by: Konrad Sztyber Reviewed-by: Krzysztof Karas --- rpmbuild/rpm.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rpmbuild/rpm.sh b/rpmbuild/rpm.sh index c42cfa6c5..2174b4a2e 100755 --- a/rpmbuild/rpm.sh +++ b/rpmbuild/rpm.sh @@ -21,10 +21,11 @@ fi get_config() { # Intercept part of the ./configure's cmdline we are interested in - configure_opts=($(getopt -l "$1::" -o "" -- $configure 2> /dev/null)) - # Drop "--" - configure_opts=("${configure_opts[@]::${#configure_opts[@]}-1}") - ((${#configure_opts[@]} > 0)) || return 1 + configure_opts=($(getopt -l "$1::" -o "" -- $configure 2> /dev/null)) || true + # If "--" is the first argument then either the cmdline is empty or doesn't + # match on what we are looking for. In either case simply return as there + # is nothing to check. + [[ ${configure_opts[0]} == "--" ]] && return 1 if [[ $2 == has-arg ]]; then [[ -n ${configure_opts[1]} && ${configure_opts[1]} != "''" ]]