Skip to content

Commit

Permalink
Merge pull request #61 from justin8/fix-pkgbase-packages
Browse files Browse the repository at this point in the history
Remove pkgtarget to fix multi-package pkgbuilds in latest pacman
  • Loading branch information
oshazard committed May 16, 2016
2 parents 1b4e0cc + 54a68e2 commit 13ddbd4
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions apacman
Original file line number Diff line number Diff line change
Expand Up @@ -726,14 +726,12 @@ aurinstall() {
fi

# Check for split PKGBUILD
unset pkgtarget
pkgbase=($(pkgbuildgrep pkgbase));
pkgname=($(pkgbuildgrep pkgname));
if [[ "${pkgbase[@]}" ]]; then
echo -e " ${COLOR5}->${ENDCOLOR}${COLOR1} Split package base: ${pkgbase[@]}${ENDCOLOR}";
if [[ "${#pkgname[@]}" -gt 1 ]]; then
echo -e " ${COLOR5}->${ENDCOLOR}${COLOR1} PKGBUILD contains: ${pkgname[@]}${ENDCOLOR}";
pkgtarget="--pkg $1"
for split in ${pkgname[@]}; do
ln -s "${builddir}/$1" "${builddir}/$split" 2>/dev/null;
done
Expand Down Expand Up @@ -773,11 +771,11 @@ aurinstall() {
askpgpkeys "${validpgpkeys[*]}"
su aurbuild -c "addpgpkeys ${validpgpkeys[*]}"
fi
su aurbuild -c "makepkg $MAKEPKGOPTS $pkgtarget -f"; buildcheck=$?
su aurbuild -c "makepkg $MAKEPKGOPTS -f"; buildcheck=$?
[[ $keyfound ]] || su aurbuild -c "removepgpkeys ${validpgpkeys[*]}"
[[ $purgekeys ]] && [[ $keyfound ]] && su aurbuild -c "removepgpkeys ${validpgpkeys[*]}"
else
su aurbuild -c "makepkg $MAKEPKGOPTS $pkgtarget -f"; buildcheck=$?
su aurbuild -c "makepkg $MAKEPKGOPTS -f"; buildcheck=$?
fi
else
if [[ $validpgpkeys ]]; then
Expand All @@ -787,11 +785,11 @@ aurinstall() {
askpgpkeys "${validpgpkeys[@]}"
addpgpkeys "${validpgpkeys[@]}"
fi
makepkg $MAKEPKGOPTS $pkgtarget -f; buildcheck=$?
makepkg $MAKEPKGOPTS -f; buildcheck=$?
[[ $keyfound ]] || removepgpkeys "${validpgpkeys[@]}"
[[ $purgekeys ]] && [[ $keyfound ]] && removepgpkeys "${validpgpkeys[@]}"
else
makepkg $MAKEPKGOPTS $pkgtarget -f; buildcheck=$?
makepkg $MAKEPKGOPTS -f; buildcheck=$?
fi
fi

Expand Down

0 comments on commit 13ddbd4

Please # to comment.