Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=5bd0c7e5e2a5ba50aa41d98dedbf88274a2ef07a
commit 5bd0c7e5e2a5ba50aa41d98dedbf88274a2ef07a Author: Michel Hermier <[email protected]> Date: Sat Nov 2 11:12:38 2013 +0100 makepkg: Add subpretriggers subposttriggers support. diff --git a/scripts/makepkg b/scripts/makepkg index a8bb602..21760cd 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -619,6 +619,12 @@ create_pkg() for it in ${backup[@]}; do $ECHO "backup = $it" >>.PKGINFO done + for it in ${pretriggers[@]}; do + $ECHO "pretrigger = $it" >>.PKGINFO + done + for it in ${posttriggers[@]}; do + $ECHO "posttrigger = $it" >>.PKGINFO + done # check for an install script if [ "$install" == "" ]; then @@ -951,7 +957,7 @@ if [ $CLEANCACHE -ge 1 ]; then fi unset pkgname pkgver pkgrel pkgdesc url license groups provides force -unset replaces depends removes conflicts backup source install makedepends +unset replaces depends removes conflicts backup pretriggers posttriggers source install makedepends unset rodepends options pkdesc_localized for i in `set|grep ^_F_|sed 's/\(=.*\| ()\)//'`; do unset $i; done umask 0022 @@ -1103,6 +1109,12 @@ if [ ! -z "$subpkgs" ]; then if [ "${#subbackup[@]}" != 0 -a "${#subbackup[@]}" != "${#subpkgs[@]}" ]; then goodsubpkgs=0 fi + if [ "${#subpretriggers[@]}" != 0 -a "${#subpretriggers[@]}" != "${#subpkgs[@]}" ]; then + goodsubpkgs=0 + fi + if [ "${#subposttriggers[@]}" != 0 -a "${#subposttriggers[@]}" != "${#subpkgs[@]}" ]; then + goodsubpkgs=0 + fi if [ "${#subinstall[@]}" != 0 -a "${#subinstall[@]}" != "${#subpkgs[@]}" ]; then goodsubpkgs=0 fi @@ -1813,7 +1825,7 @@ if [ ! -z "$subpkgs" ]; then i=0 for subpkg in "${subpkgs[@]}" do - unset pkgdesc license replaces groups depends rodepends removes conflicts provides backup install + unset pkgdesc license replaces groups depends rodepends removes conflicts provides backup pretriggers posttrigger install unset options pkgdesc_localized archs pkgdesc="${subdescs[$i]}" pkgdesc_localized="${subdescs_localized[$i]}" @@ -1826,6 +1838,8 @@ if [ ! -z "$subpkgs" ]; then conflicts="${subconflicts[$i]}" provides="${subprovides[$i]}" backup="${subbackup[$i]}" + pretriggers="${subpretriggers[$i]}" + posttriggers="${subposttriggers[$i]}" install="${subinstall[$i]}" options="${suboptions[$i]}" archs="${subarchs[$i]}" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
