diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2017-03-06 08:16:24 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2017-03-06 08:16:24 +0000 |
| commit | fed5e3b8c7df8495768a04d24caf4dc74feacb5a (patch) | |
| tree | c1472b41ab93c45d07b98b31f6d3665b0a0f36d8 /usr.sbin/sysmerge/sysmerge.sh | |
| parent | De-platformize exynos. Disable exdisplay(4) for now. (diff) | |
| download | wireguard-openbsd-fed5e3b8c7df8495768a04d24caf4dc74feacb5a.tar.xz wireguard-openbsd-fed5e3b8c7df8495768a04d24caf4dc74feacb5a.zip | |
Just exit 1 instead of printing usage on error.
prodded by deraadt@
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.sh')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 0d16ce51eaa..89dbcee0ce1 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.229 2017/01/11 08:50:11 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.230 2017/03/06 08:16:24 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -621,7 +621,7 @@ done shift $(( OPTIND -1 )) [[ $# -ne 0 ]] && usage -[[ $(id -u) -ne 0 ]] && echo "${0##*/}: need root privileges" && usage +[[ $(id -u) -ne 0 ]] && echo "${0##*/}: need root privileges" && exit 1 # global constants _BKPDIR=/var/sysmerge/backups |