Set PKG_CACHEDIR to an 'All/' directory one level lower

to fix 'pkg repo' generating repository metadata for the
on-disc packages.

MFC after:	3 days
X-MFC-to-10.1:	yes
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2014-09-12 18:52:01 +00:00
parent cb8a626055
commit 017717d87f

View File

@ -44,7 +44,8 @@ PKG_ABI=$(pkg -vv | grep ^ABI | awk '{print $3}')
PKG_ABI="${PKG_ABI%\";}"
PKG_ABI="${PKG_ABI#\"}"
export PKG_ABI
export PKG_CACHEDIR="dvd/packages/${PKG_ABI}"
export PKG_REPODIR="dvd/packages/${PKG_ABI}"
export PKG_CACHEDIR="${PKG_REPODIR}/${PKG_ABI}/All"
/bin/mkdir -p ${PKG_CACHEDIR}
@ -53,7 +54,7 @@ ${PKGCMD} -vv
${PKGCMD} update -f
${PKGCMD} fetch -d ${DVD_PACKAGES}
${PKGCMD} repo ${PKG_CACHEDIR}
${PKGCMD} repo ${PKG_REPODIR}
# Always exit '0', even if pkg(8) complains about conflicts.
exit 0