[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/6] configure: silence 'shift' error message in version_ge()
From: |
Paolo Bonzini |
Subject: |
[PULL 3/6] configure: silence 'shift' error message in version_ge() |
Date: |
Fri, 21 Aug 2020 17:14:09 -0400 |
From: Stefano Garzarella <sgarzare@redhat.com>
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>
---
configure | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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
}
--
2.26.2
- [PULL 0/6] Meson build system fixes, Paolo Bonzini, 2020/08/21
- [PULL 3/6] configure: silence 'shift' error message in version_ge(),
Paolo Bonzini <=
- [PULL 2/6] util/meson.build: fix fdmon-io_uring build, Paolo Bonzini, 2020/08/21
- [PULL 1/6] target/s390x: fix meson.build issue, Paolo Bonzini, 2020/08/21
- [PULL 4/6] meson: convert pc-bios/keymaps/Makefile, Paolo Bonzini, 2020/08/21
- [PULL 5/6] meson: Fix --disable-tools --enable-system builds, Paolo Bonzini, 2020/08/21
- [PULL 6/6] keymaps: update, Paolo Bonzini, 2020/08/21
- Re: [PULL 0/6] Meson build system fixes, Peter Maydell, 2020/08/22
- Re: [PULL 0/6] Meson build system fixes, Peter Maydell, 2020/08/23