diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2008-07-10 16:49:27 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2008-07-10 16:49:27 +0000 |
| commit | 1866bdc9ada64847e58e3d7ef71e8e9530f05f65 (patch) | |
| tree | 0f2b49fb15bc6b4ed7d1f29e6a4dbf62ed6f6b71 /usr.sbin/sysmerge | |
| parent | b8271562e76d5f4318b8953026e3b35202323b1a (diff) | |
Fix "etc source" output when not using a tarball
ok "bien sur!" sthen@
Diffstat (limited to 'usr.sbin/sysmerge')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 72bc1259051..db2b18a5f32 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: sysmerge.sh,v 1.17 2008/07/08 11:04:28 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.18 2008/07/10 16:49:26 ajacoutot Exp $ # # This script is based on the FreeBSD mergemaster script, written by # Douglas Barton <DougB@FreeBSD.org> @@ -59,8 +59,10 @@ do_pre() { if [ -n "${TGZURL}" ]; then echo " etc source: ${TGZURL}" echo " (fetched in ${TGZ})" - else - [ -n "${TGZ}" ] && echo " etc source: ${TGZ}" + elif [ -n "${TGZ}" ]; then + echo " etc source: ${TGZ}" + elif [ -n "${SRCDIR}" ]; then + echo " etc source: ${SRCDIR}" fi if [ -n "${XTGZURL}" ]; then echo " xetc source: ${XTGZURL}" |