Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=8ddb8b1550070e53a2671cd4203a34cb6c9174c5
commit 8ddb8b1550070e53a2671cd4203a34cb6c9174c5 Author: Michel Hermier <[email protected]> Date: Wed Nov 21 13:03:11 2012 +0100 scripts/makepkg * Move .INSTALL creation outside of pkg_create. diff --git a/scripts/makepkg b/scripts/makepkg index 8f5598a..9a5d4f0 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -515,10 +515,28 @@ pkg_print_pkginfo() } pkg_create_pkginfo() { - msg2 "$1: PKGINFO file... " >&2 + msg2 "$1: .PKGINFO file..." >&2 pkg_print_pkginfo "$1" > .PKGINFO } +pkg_create_install() { + local install + + # check for an install script + install="${_P_package_install["$1"]}" + if [ "$install" = "" ]; then + [ -e "$startdir/$1.install" ] && install="$1.install" + fi + if [ "$install" != "" ]; then + msg2 "$1: .INSTALL file..." >&2 + if [ "`$ECHO $install |sed 's/^\(.\).*/\1/'`" = "/" ]; then + cp "$install" '.INSTALL' + else + cp "$startdir/$install" '.INSTALL' + fi + fi +} + pkg_create_archive() { local i tarargs tarball @@ -545,25 +563,10 @@ pkg_create_archive() { create_pkg() { - local install - msg "Generating files for $1:" cd "$startdir/pkg.$1" pkg_create_pkginfo "$1" - - # check for an install script - install="${_P_package_install["$1"]}" - if [ "$install" == "" ]; then - [ -e $startdir/$1.install ] && install=$1.install - fi - if [ "$install" != "" ]; then - msg2 ".INSTALL file... " >&2 - if [ "`$ECHO $install |sed 's/^\(.\).*/\1/'`" = "/" ]; then - cp $install .INSTALL - else - cp $startdir/$install .INSTALL - fi - fi + pkg_create_install "$1" if [ -f $startdir/Changelog ]; then msg2 ".CHANGELOG file... " >&2 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
