diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2008-07-10 16:49:26 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2008-07-10 16:49:26 +0000 |
| commit | afa585bf7d5ee333ff672db7c9145c259a18f8ab (patch) | |
| tree | afd34140e431281db145ed747d6cd0ad43a011db | |
| parent | Don't terminate the array of matching product/vendor IDs with { 0, 0 } (diff) | |
| download | wireguard-openbsd-afa585bf7d5ee333ff672db7c9145c259a18f8ab.tar.xz wireguard-openbsd-afa585bf7d5ee333ff672db7c9145c259a18f8ab.zip | |
Fix "etc source" output when not using a tarball
ok "bien sur!" sthen@
| -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}" |