Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2009-03-25 23:52:27 +1000
committerAllan McRae <allan@archlinux.org>2009-03-25 23:52:27 +1000
commit4c27a776bd6287d6022a014d4d87ebe6ec6c75f9 (patch)
tree5c07b7d6a6d4edc3cd8dc0a78709bad8d8aefbba /scripts
parent7a8ba5a978024228fa3b068fd77d778b44f47ae0 (diff)
makepkg: adjust install_package for split packages
Install all created packages when using the install option with package splitting. Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/makepkg.sh.in17
1 files changed, 14 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index a8044896..95ee5200 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1052,11 +1052,22 @@ create_srcpackage() {
install_package() {
[ "$INSTALL" -eq 0 ] && return
- msg "$(gettext "Installing package ${pkgname} with pacman -U...")"
+
+ if [ "$SPLITPKG" -eq 0 ]; then
+ msg "$(gettext "Installing package ${pkgname} with pacman -U...")"
+ else
+ msg "$(gettext "Installing ${pkgbase} package group with pacman -U...")"
+ fi
+
+ local pkglist
+ for pkg in ${pkgname[@]}; do
+ pkglist="${pkglist} $PKGDEST/${pkg}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}"
+ done
+
if [ "$ASROOT" -eq 0 ]; then
- sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} || exit $?
+ sudo pacman $PACMAN_OPTS -U ${pkglist} || exit $?
else
- pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT} || exit $?
+ pacman $PACMAN_OPTS -U ${pkglist} || exit $?
fi
}