diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2014-02-08 23:58:06 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2014-02-08 23:58:06 +0000 |
| commit | 5acd2746f18ea10e13d4f81b1ad096c7b8dba5ab (patch) | |
| tree | de430f0f327e3645ce614fea85959a20e25540ea /usr.sbin/sysmerge | |
| parent | Do not bzero() the available memory in pmap_bootstrap(); allocations in (diff) | |
| download | wireguard-openbsd-5acd2746f18ea10e13d4f81b1ad096c7b8dba5ab.tar.xz wireguard-openbsd-5acd2746f18ea10e13d4f81b1ad096c7b8dba5ab.zip | |
Only create DBDIR if it does not exist.
Diffstat (limited to 'usr.sbin/sysmerge')
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 0b89a5ab910..1bfc52bb69c 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.120 2014/02/07 18:15:27 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.121 2014/02/08 23:58:06 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -172,10 +172,13 @@ prepare_src() { sm_populate() { local cf i _array _d _r _D _R CF_DIFF CF_FILES CURSUM IGNORE_FILES - mkdir -p ${DESTDIR}/${DBDIR} || error_rm_wrkdir "cannot create ${DESTDIR}/${DBDIR}" echo "===> Populating temporary root under ${TEMPROOT}" mkdir -p ${TEMPROOT} + if [ ! -d ${DESTDIR}/${DBDIR} ]; then + mkdir -p ${DESTDIR}/${DBDIR} || exit 1 + fi + prepare_src extract_set "${TGZ}" etc extract_set "${XTGZ}" xetc |