From eb93955477c411eaf914c2f1650ce37d02d8b56e Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sat, 25 Dec 2010 13:14:55 +1000 Subject: makepkg: allow pkgname usage in split package functions Currently, using $pkgname in a split package package_*() function always returns the first value in the pkgname array rather than the name of tha package being packaged. Fix this so $pkgname gives the expected value. Fixes FS#22174 Signed-off-by: Allan McRae Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 1996dd46..79b307aa 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1406,17 +1406,19 @@ restore_package_variables() { } run_split_packaging() { - for pkg in ${pkgname[@]}; do - pkgdir="$pkgdir/$pkg" + local pkgname_backup=${pkgname[@]} + for pkgname in ${pkgname_backup[@]}; do + pkgdir="$pkgdir/$pkgname" mkdir -p "$pkgdir" chmod a-s "$pkgdir" backup_package_variables - run_package $pkg + run_package $pkgname tidy_install - create_package $pkg + create_package $pkgname restore_package_variables pkgdir="${pkgdir%/*}" done + pkgname=${pkgname_backup[@]} } # Canonicalize a directory path if it exists -- cgit v1.2.3-24-g4f1b