Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=82d6b13253a010732e94334e17dcfa0c8f309c7f
commit 82d6b13253a010732e94334e17dcfa0c8f309c7f Author: Michel Hermier <[email protected]> Date: Sun Nov 18 10:28:24 2012 +0100 scripts/makepkg * Simplify package list creation in install_pkg. diff --git a/scripts/makepkg b/scripts/makepkg index 6d3be93..3d7271b 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -618,27 +618,18 @@ in_array() install_pkg() { + local subpkg targs + + for subpkg in "${pkgname}" "${subpkgs[@]}" + do + targs+=" $PKGDEST/${subpkg}-${pkgver}-${pkgrel}-${CARCH}.$PKG_EXT" + done + if [ "$INSTALL" = "1" -a "`id -u`" = "0" -a "$INFAKEROOT" != "1" ]; then msg "Installing package(s) with $PACMAN -U..." - targs="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.$PKG_EXT" - if [ ! -z "$subpkgs" ]; then - i=0 - for subpkg in "${subpkgs[@]}" - do - targs="$targs $PKGDEST/${subpkg}-${pkgver}-${pkgrel}-${CARCH}.$PKG_EXT" - done - fi $PACMAN $PACMAN_OPTS -U $targs || exit $? elif [ "$INSTALL" = "1" -a "$DEP_SUDO" = "1" ]; then msg "Installing package(s) with sudo $PACMAN -U..." - targs="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.$PKG_EXT" - if [ ! -z "$subpkgs" ]; then - i=0 - for subpkg in "${subpkgs[@]}" - do - targs="$targs $PKGDEST/${subpkg}-${pkgver}-${pkgrel}-${CARCH}.$PKG_EXT" - done - fi if [ "$INFAKEROOT" = "1" ]; then FAKEROOTKEY2=$FAKEROOTKEY unset FAKEROOTKEY _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
