mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
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 <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
a7972625e3
commit
eb93955477
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user