aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/mergemaster
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2009-03-13 07:34:05 +0000
committerDoug Barton <dougb@FreeBSD.org>2009-03-13 07:34:05 +0000
commit3fdabc0de147c38e9d12f8abfc84871131f0d935 (patch)
tree5c7d920d74dec86bd497ad2738a922d95748d29a /usr.sbin/mergemaster
parent25bacc7818f726c45f2ff8ec588513eb8a7864f5 (diff)
Notes
Diffstat (limited to 'usr.sbin/mergemaster')
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 2f2f55b43d04..e788138cf585 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -671,7 +671,7 @@ find ${TEMPROOT} -type f -size 0 -delete 2>/dev/null
# Build the mtree database in a temporary location.
MTREENEW=`mktemp -t mergemaster.mtree`
case "${PRE_WORLD}" in
-'') mtree -ci -p ${TEMPROOT} -k size,md5digest > ${DESTDIR}${MTREENEW} 2>/dev/null
+'') mtree -ci -p ${TEMPROOT} -k size,md5digest > ${MTREENEW} 2>/dev/null
;;
*) # We don't want to mess with the mtree database on a pre-world run.
;;
@@ -1037,10 +1037,10 @@ done # This is for the do way up there at the beginning of the comparison
echo ''
echo "*** Comparison complete"
-if [ -f "${DESTDIR}${MTREENEW}" ]; then
+if [ -f "${MTREENEW}" ]; then
echo "*** Saving mtree database for future upgrades"
- test -e "${MTREEFILE}" && unlink ${MTREEFILE}
- mv ${DESTDIR}${MTREENEW} ${DESTDIR}${MTREEFILE}
+ test -e "${DESTDIR}${MTREEFILE}" && unlink ${DESTDIR}${MTREEFILE}
+ mv ${MTREENEW} ${DESTDIR}${MTREEFILE}
fi
echo ''