diff options
author | Stefano Garzarella <sgarzare@redhat.com> | 2020-08-21 22:35:58 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-08-21 17:03:11 -0400 |
commit | c44a33e2fe0688b323a5a8c76852f286fc02be9f (patch) | |
tree | ba22d635e0b7a56ea50f333a0c5a46ba4e6cdd4e | |
parent | 6dd93c2bde99ab4ec066d696b121fdc0188d9856 (diff) |
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 <eblake@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200821203558.10338-1-sgarzare@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 } |