Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=3310abbeee6d893f301f53d22ad36c211cda3481
commit 3310abbeee6d893f301f53d22ad36c211cda3481 Author: Michel Hermier <[email protected]> Date: Tue Nov 20 20:44:18 2012 +0100 scripts/makepkg * Split pkginfo creation outside of create_pkg so a single file redirection is required to create the file. diff --git a/scripts/makepkg b/scripts/makepkg index 1b279a8..378ea60 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -461,66 +461,68 @@ rmdir_subpkgs() fi } -create_pkg() +pkg_pkginfo() { - local install it - - msg "Generating files for $1:" - # write the .PKGINFO file - msg2 ".PKGINFO file... " >&2 - if [ "$1" = "$pkgname" ]; then - cd $startdir/pkg - else - cd $startdir/pkg.$1 - fi - size=`du -cb . | tail -n 1 | awk '{print $1}'` - $ECHO "# Generated by makepkg" >.PKGINFO - $ECHO -n "# " >>.PKGINFO - date >>.PKGINFO - $ECHO "pkgname = $1" >>.PKGINFO - $ECHO "pkgver = $pkgver-$pkgrel" >>.PKGINFO - $ECHO "pkgdesc = ${_P_package_descriptions["$1"]}" >>.PKGINFO + local it + + # Print .PKGINFO file to stdout + size=`du -cb "$startdir/pkg.$1" | tail -n 1 | awk '{print $1}'` + $ECHO "# Generated by makepkg" + $ECHO "# $(date)" + $ECHO "pkgname = $1" + $ECHO "pkgver = $pkgver-$pkgrel" + $ECHO "pkgdesc = ${_P_package_descriptions["$1"]}" if [ -n "$pkgdesc_localized" ]; then for it in "${pkgdesc_localized[@]}"; do - $ECHO "pkgdesc = $it" >>.PKGINFO + $ECHO "pkgdesc = $it" done fi - $ECHO "url = $url" >>.PKGINFO - $ECHO "builddate = $builddate" >>.PKGINFO - $ECHO "buildtype = $buildtype" >>.PKGINFO - $ECHO "packager = $packager" >>.PKGINFO - $ECHO "size = $size" >>.PKGINFO + $ECHO "url = $url" + $ECHO "builddate = $builddate" + $ECHO "buildtype = $buildtype" + $ECHO "packager = $packager" + $ECHO "size = $size" if [ "$CARCH" != "" ]; then - $ECHO "arch = $CARCH" >>.PKGINFO + $ECHO "arch = $CARCH" fi for it in ${_P_package_licenses["$1"]}; do - $ECHO "license = $it" >>.PKGINFO + $ECHO "license = $it" done for it in ${_P_package_replaces["$1"]}; do - $ECHO "replaces = $it" >>.PKGINFO + $ECHO "replaces = $it" done for it in ${_P_package_groups["$1"]}; do - $ECHO "group = $it" >>.PKGINFO + $ECHO "group = $it" done for it in ${_P_package_depends["$1"]}; do - $ECHO "depend = $it" >>.PKGINFO + $ECHO "depend = $it" done for it in ${_P_package_rodepends["$1"]}; do - $ECHO "depend = $it" >>.PKGINFO + $ECHO "depend = $it" done for it in ${_P_package_removes["$1"]}; do - $ECHO "remove = $it" >>.PKGINFO + $ECHO "remove = $it" done for it in ${_P_package_conflicts["$1"]}; do - $ECHO "conflict = $it" >>.PKGINFO + $ECHO "conflict = $it" done for it in ${_P_package_provides["$1"]}; do - $ECHO "provides = $it" >>.PKGINFO + $ECHO "provides = $it" done for it in ${_P_package_backup["$1"]}; do - $ECHO "backup = $it" >>.PKGINFO + $ECHO "backup = $it" done +} + +create_pkg() +{ + local install + + msg "Generating files for $1:" + cd "$startdir/pkg.$1" + msg2 ".PKGINFO file... " >&2 + pkg_pkginfo "$1" > .PKGINFO # check for an install script install="${_P_package_install["$1"]}" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
