diff options
| author |   florian <florian@openbsd.org> | 2019-11-03 18:22:45 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2019-11-03 18:22:45 +0000 |
| commit | 78d89173dc7d0441538d5e24930d2567e150c518 (patch) | |
| tree | 8538b96b79d3956e8cc05ea8479d9a962ca4d594 /usr.sbin/sysupgrade | |
| parent | When we are talking to an upstream nameserver we should not refuse to (diff) | |
| download | wireguard-openbsd-78d89173dc7d0441538d5e24930d2567e150c518.tar.xz wireguard-openbsd-78d89173dc7d0441538d5e24930d2567e150c518.zip | |
Our version numbers go
m.n-beta -> m.n
not
m.n-beta -> m.n + 0.1
Handle this correctly for the -r case to stick to a release after
beta.
OK sthen
Diffstat (limited to 'usr.sbin/sysupgrade')
| -rw-r--r-- | usr.sbin/sysupgrade/sysupgrade.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.sbin/sysupgrade/sysupgrade.sh b/usr.sbin/sysupgrade/sysupgrade.sh index 8435971f096..9048fbd660e 100644 --- a/usr.sbin/sysupgrade/sysupgrade.sh +++ b/usr.sbin/sysupgrade/sysupgrade.sh @@ -1,6 +1,6 @@ #!/bin/ksh # -# $OpenBSD: sysupgrade.sh,v 1.29 2019/10/26 04:04:20 deraadt Exp $ +# $OpenBSD: sysupgrade.sh,v 1.30 2019/11/03 18:22:45 florian Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015 Robert Peichaer <rpe@openbsd.org> @@ -114,7 +114,11 @@ if ! $RELEASE && [[ ${#_KERNV[*]} == 2 ]]; then SNAP=true fi -NEXT_VERSION=$(echo ${_KERNV[0]} + 0.1 | bc) +if $RELEASE && [[ ${_KERNV[1]} == '-beta' ]]; then + NEXT_VERSION=${_KERNV[0]} +else + NEXT_VERSION=$(echo ${_KERNV[0]} + 0.1 | bc) +fi if $SNAP; then URL=${MIRROR}/snapshots/${ARCH}/ |