From c44a33e2fe0688b323a5a8c76852f286fc02be9f Mon Sep 17 00:00:00 2001 From: Stefano Garzarella Date: Fri, 21 Aug 2020 22:35:58 +0200 Subject: configure: silence 'shift' error message in version_ge() If there are less than 2 arguments in version_ge(), the second 'shift' prints this error: ../configure: line 232: shift: shift count out of range As Eric suggested, we can use 'shift ${2:+2}' which works out to 'shift 2' if $2 is set, or 'shift' (implicitly shift 1) if $2 is not set. This patch replaces both 'shift; shift' occurrences in version_ge() with 'shift ${2:+2}'. Suggested-by: Eric Blake Signed-off-by: Stefano Garzarella Reviewed-by: Eric Blake Message-Id: <20200821203558.10338-1-sgarzare@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 4e5fe33211..d9ca87fbbb 100755 --- a/configure +++ b/configure @@ -228,15 +228,15 @@ version_ge () { while true; do set x $local_ver1 local_first=${2-0} - # shift 2 does nothing if there are less than 2 arguments - shift; shift + # 'shift 2' if $2 is set, or 'shift' if $2 is not set + shift ${2:+2} local_ver1=$* set x $local_ver2 # the second argument finished, the first must be greater or equal test $# = 1 && return 0 test $local_first -lt $2 && return 1 test $local_first -gt $2 && return 0 - shift; shift + shift ${2:+2} local_ver2=$* done } -- cgit v1.2.3