diff options
| author | Christian Weisgerber <naddy@cvs.openbsd.org> | 2019-04-25 22:12:12 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@cvs.openbsd.org> | 2019-04-25 22:12:12 +0000 |
| commit | f8e4c18351840b7189b0181b9f578e38c1408134 (patch) | |
| tree | 69bb88cbd921575146fc24dc42d5661f3c2ef6e3 /usr.sbin | |
| parent | 404b2235d6bb02f124158ca1133cb967ede9dc5a (diff) | |
don't be overly specific in set selection and don't use an undefined
variable
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sysupgrade/sysupgrade.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/sysupgrade/sysupgrade.sh b/usr.sbin/sysupgrade/sysupgrade.sh index 0eafb01989b..21d1df6b6eb 100644 --- a/usr.sbin/sysupgrade/sysupgrade.sh +++ b/usr.sbin/sysupgrade/sysupgrade.sh @@ -1,6 +1,6 @@ #!/bin/ksh # -# $OpenBSD: sysupgrade.sh,v 1.1 2019/04/25 20:22:52 florian Exp $ +# $OpenBSD: sysupgrade.sh,v 1.2 2019/04/25 22:12:11 naddy Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015 Robert Peichaer <rpe@openbsd.org> @@ -112,8 +112,9 @@ SIGNIFY_KEY=/etc/signify/openbsd-$(sed -n \ unpriv signify -qV -p "${SIGNIFY_KEY}" -x SHA256.sig -e -m /dev/null -SETS=$(sed -e 's/^SHA256 (\(.*\)) .*/\1/' \ - -e "/^INSTALL.${ARCH}\$/p;/^bsd/p;/$version\.tgz\$/p;d" SHA256.sig) +# INSTALL.*, bsd*, *.tgz +SETS=$(sed -n -e 's/^SHA256 (\(.*\)) .*/\1/' \ + -e "/^INSTALL\./p;/^bsd/p;/\.tgz\$/p" SHA256.sig) OLD_FILES=$(ls) OLD_FILES=$(rmel SHA256.sig $OLD_FILES) |