Cleanup some of the DB addition code
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
This commit is contained in:
parent
49947d8fb3
commit
fef3f4af90
|
@ -223,15 +223,16 @@ chmod +x "$uniondir/chrootbuild"
|
||||||
if mkarchroot -r "/chrootbuild" "$uniondir"; then
|
if mkarchroot -r "/chrootbuild" "$uniondir"; then
|
||||||
source ${WORKDIR}/PKGBUILD
|
source ${WORKDIR}/PKGBUILD
|
||||||
|
|
||||||
if [ -n "$add_to_db" ]; then
|
pkgfile=${chrootdir}/union/pkgdest/${pkgname}-${pkgver}-${pkgrel}-*.pkg.tar.gz
|
||||||
|
|
||||||
|
if [ -n "$add_to_db" -a -e "$pkgfile" ]; then
|
||||||
[ -d "${chrootdir}/union/repo" ] || mkdir -p "${chrootdir}/union/repo"
|
[ -d "${chrootdir}/union/repo" ] || mkdir -p "${chrootdir}/union/repo"
|
||||||
pushd "${chrootdir}/union/repo" >/dev/null
|
pushd "${chrootdir}/union/repo" >/dev/null
|
||||||
cp ${chrootdir}/union/pkgdest/${pkgname}-${pkgver}-${pkgrel}-*.pkg.tar.gz .
|
cp "$pkgfile" .
|
||||||
repo-add repo.db.tar.gz *.pkg.tar.gz
|
repo-add repo.db.tar.gz "${pkgname}-${pkgver}-${pkgrel}-*.pkg.tar.gz"
|
||||||
popd >/dev/null
|
popd >/dev/null
|
||||||
fi
|
fi
|
||||||
|
|
||||||
pkgfile=${chrootdir}/union/pkgdest/${pkgname}-${pkgver}-${pkgrel}-*.pkg.tar.gz
|
|
||||||
if [ -e "$pkgfile" ]; then
|
if [ -e "$pkgfile" ]; then
|
||||||
if [ -n "$PKGDEST" ]; then
|
if [ -n "$PKGDEST" ]; then
|
||||||
echo "Moving completed package file to ${PKGDEST}"
|
echo "Moving completed package file to ${PKGDEST}"
|
||||||
|
|
Loading…
Reference in New Issue