#!/bin/ksh -
#
-# $OpenBSD: sysmerge.sh,v 1.140 2014/07/15 09:27:04 ajacoutot Exp $
+# $OpenBSD: sysmerge.sh,v 1.141 2014/07/15 15:30:56 ajacoutot Exp $
#
# Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org>
[[ ${_set} == etc ]] && _tgz=${WRKDIR}/${TGZ##*/}
[[ ${_set} == xetc ]] && _tgz=${WRKDIR}/${XTGZ##*/}
- tar -tzf "${_tgz}" .${DBDIR}/sysmerge/${_set}sum >/dev/null ||
- error_rm_wrkdir "${_tgz##*/}: badly formed \"${_set}\" set, lacks .${DBDIR}/sysmerge/${_set}sum"
+ tar -tzf "${_tgz}" .${DBDIR}/${_set}sum >/dev/null ||
+ error_rm_wrkdir "${_tgz##*/}: badly formed \"${_set}\" set, lacks .${DBDIR}/${_set}sum"
(cd ${TEMPROOT} && tar -xzphf "${_tgz}" && \
find . -type f -and ! -type l | xargs sha256 -h ${WRKDIR}/${_set}sum) || \