summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortb <tb@openbsd.org>2019-01-20 21:13:56 +0000
committertb <tb@openbsd.org>2019-01-20 21:13:56 +0000
commit3d33c9bf43a5dd0d9e8267b3ea65cc6ca6e17c61 (patch)
tree9c086b3cb3a8dcdee17bc4015890dc197f500322
parentNo leading space(s) before labels. (diff)
downloadwireguard-openbsd-3d33c9bf43a5dd0d9e8267b3ea65cc6ca6e17c61.tar.xz
wireguard-openbsd-3d33c9bf43a5dd0d9e8267b3ea65cc6ca6e17c61.zip
Remove the "done." dance around checking for syspatches to avoid
ugliness in case an error occurs. ok ajacoutot
-rw-r--r--distrib/miniroot/install.sub7
1 files changed, 3 insertions, 4 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index befb0658ded..ac0f3101a10 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: install.sub,v 1.1106 2019/01/16 23:50:37 ajacoutot Exp $
+# $OpenBSD: install.sub,v 1.1107 2019/01/20 21:13:56 tb Exp $
#
# Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
# Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -2797,9 +2797,8 @@ set -A _KERNV -- \$(sysctl -n kern.version |
sed 's/^OpenBSD \([0-9]\.[0-9]\)\([^ ]*\).*/\1 \2/;q')
if ((\${#_KERNV[*]} == 1)) && [[ -s /etc/installurl ]] &&
_CKPATCH=\$(mktemp /tmp/_ckpatch.XXXXXXXXXX); then
- echo -n "Checking for available binary patches..."
- syspatch -c > \$_CKPATCH && echo -n " done."
- echo
+ echo "Checking for available binary patches..."
+ syspatch -c > \$_CKPATCH
if [[ -s \$_CKPATCH ]]; then
echo "Run syspatch(8) to install:"
column -xc 80 \$_CKPATCH