bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: Create a single-package packaging function

Browse source 
Merge the similar code handling unsplit PKGBUILDs and individual
packages in a split PKGBUILD and make it a new function.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Jan Alexander Steffens (heftig) 2019-01-04 13:09:38 +10:00 • committed by Allan McRae
parent 7c5958e0eb
commit 2f15921230
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
scripts/makepkg.sh.in
View file

@ -922,20 +922,25 @@ restore_package_variables() {
done
}
run_single_packaging() {
pkgdir="$pkgdirbase/$pkgname"
mkdir "$pkgdir"
if [[ -n $1 ]] || (( PKGFUNC )); then
run_package $1
fi
tidy_install
lint_package || exit $E_PACKAGE_FAILED
create_package
}
run_split_packaging() {
local pkgname_backup=("${pkgname[@]}")
backup_package_variables
for pkgname in ${pkgname_backup[@]}; do
pkgdir="$pkgdirbase/$pkgname"
mkdir "$pkgdir"
run_package $pkgname
tidy_install
lint_package || exit $E_PACKAGE_FAILED
create_package
run_single_packaging $pkgname
restore_package_variables
done
pkgname=("${pkgname_backup[@]}")
create_debug_package
}
usage() {
@ -1337,18 +1342,12 @@ if (( INFAKEROOT )); then
chmod 755 "$pkgdirbase"
if (( ! SPLITPKG )); then
pkgdir="$pkgdirbase/$pkgname"
mkdir "$pkgdir"
if (( PKGFUNC )); then
run_package
fi
tidy_install
lint_package || exit $E_PACKAGE_FAILED
create_package
create_debug_package
run_single_packaging
else
run_split_packaging
fi
create_debug_package
msg "$(gettext "Leaving %s environment.")" "fakeroot"
exit $E_OK