summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2017-03-06 08:16:25 +0000
committerAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2017-03-06 08:16:25 +0000
commit0f632f868c80e066a9f6bf6b7aacd0146aae83bd (patch)
treed6d3a3e973c8c490e95b0370c5e74edcacb844cd
parent4c7437f305876b55357766bbfbdaa73162fd1c9f (diff)
Just exit 1 instead of printing usage on error.
prodded by deraadt@
-rw-r--r--usr.sbin/sysmerge/sysmerge.sh4
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