summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2010-08-21 09:32:01 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2010-08-21 09:32:01 +0000
commit7ff32a218d73feedf82395603c7016731e6b4089 (patch)
tree051b66214662a28d55bc1cecae68375143ae0d7f /usr.sbin
parent9ac321b7c256e5da1096caaaa0bb9b8415910499 (diff)
Display usage information as well as the error when a path to
src/*.tgz isn't specified. ok ajacoutot@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/sysmerge/sysmerge.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh
index 54520a8133e..30ae7b14a8e 100644
--- a/usr.sbin/sysmerge/sysmerge.sh
+++ b/usr.sbin/sysmerge/sysmerge.sh
@@ -1,6 +1,6 @@
#!/bin/ksh -
#
-# $OpenBSD: sysmerge.sh,v 1.62 2010/07/20 05:35:29 ajacoutot Exp $
+# $OpenBSD: sysmerge.sh,v 1.63 2010/08/21 09:32:00 sthen Exp $
#
# Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org>
# Copyright (c) 2008, 2009, 2010 Antoine Jacoutot <ajacoutot@openbsd.org>
@@ -697,6 +697,7 @@ if [ -z "${SRCDIR}" -a -z "${TGZ}" -a -z "${XTGZ}" ]; then
SRCDIR=/usr/src
else
echo " *** Error: please specify a valid path to src or (x)etcXX.tgz"
+ usage
error_rm_wrkdir
fi
fi