From 7f5c486666cc99fba4029b2c059ae062b7dd7933 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 24 Jul 2010 17:13:01 -0400 Subject: Always treat PKGLIST as an array. Fixes repackaging issues when multiple package names are passed to the --pkg option. Signed-off-by: Dave Reisner Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 516e1d7c..562e8758 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -73,7 +73,7 @@ HOLDVER=0 BUILDFUNC=0 PKGFUNC=0 SPLITPKG=0 -PKGLIST="" +PKGLIST=() # Forces the pkgver of the current PKGBUILD. Used by the fakeroot call # when dealing with svn/cvs/etc PKGBUILDs. @@ -1585,7 +1585,7 @@ while true; do -m|--nocolor) USE_COLOR='n' ;; -o|--nobuild) NOBUILD=1 ;; -p) shift; BUILDFILE=$1 ;; - --pkg) shift; PKGLIST=$1 ;; + --pkg) shift; PKGLIST=($1) ;; -r|--rmdeps) RMDEPS=1 ;; -R|--repackage) REPKG=1 ;; --skipinteg) SKIPINTEG=1 ;; @@ -1800,7 +1800,7 @@ pkgbase=${pkgbase:-${pkgname[0]}} if [[ -n "${PKGLIST[@]}" ]]; then unset pkgname - pkgname="${PKGLIST[@]}" + pkgname=("${PKGLIST[@]}") fi if (( ! SPLITPKG )); then -- cgit v1.2.3-70-g09d2