Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=e2b220b475e4507f85a025545abd2e88a2a27f33
commit e2b220b475e4507f85a025545abd2e88a2a27f33 Author: Michel Hermier <[email protected]> Date: Wed Nov 21 17:29:44 2012 +0100 scripts/makepkg * Coding style fixes. diff --git a/scripts/makepkg b/scripts/makepkg index 18f0e43..6608e34 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -182,12 +182,11 @@ strip_url() { } checkdeps() { - local missdep="" - local deplist="" + local deplist="" missdep="" ret [ $# -gt 0 ] || return - missdep=`$PACMAN $PACMAN_OPTS -T $*` + missdep="$($PACMAN $PACMAN_OPTS -T "$@")" ret=$? if [ "$ret" != "0" ]; then if [ "$ret" = "127" ]; then @@ -1297,25 +1296,25 @@ msg "Making package: $pkgname $pkgver-$pkgrel (`date`)" unset deplist makedeplist if [ `type -p $PACMAN` -a "$NODEPS" = "0" ]; then msg "Checking Buildtime Dependencies..." - makedeplist=`checkdeps ${makedepends[@]}` + makedeplist="$(checkdeps "${makedepends[@]}")" handledeps $makedeplist if [ $? -gt 0 ]; then exit 1 fi # check deps again to make sure they were resolved - deplist=`checkdeps ${makedepends[@]}` + deplist="$(checkdeps "${makedepends[@]}")" if [ ! -z "$deplist" ]; then error "Failed to install missing buildtime dependencies." exit 1 fi msg "Checking Runtime Dependencies..." - deplist=`checkdeps ${depends[@]}` + deplist="$(checkdeps "${depends[@]}")" handledeps $deplist if [ $? -gt 0 ]; then exit 1 fi # check deps again to make sure they were resolved - deplist=`checkdeps ${depends[@]}` + deplist="$(checkdeps "${depends[@]}")" if [ ! -z "$deplist" ]; then error "Failed to install missing dependencies." exit 1 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
