Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=a5ffe04ed23f7c79d69851299cffed1d50b5bc91
commit a5ffe04ed23f7c79d69851299cffed1d50b5bc91 Author: Michel Hermier <[email protected]> Date: Wed Nov 21 12:31:01 2012 +0100 scripts/makepkg * Extract tarball creation of pkg_create (and refactor it). diff --git a/scripts/makepkg b/scripts/makepkg index fb3ea0f..7ad5239 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -514,6 +514,30 @@ pkg_pkginfo() done } +pkg_create_archive() { + local i tarargs tarball + + tarball="$1-$pkgver-$pkgrel-$CARCH.$PKG_EXT" + msg2 "Compressing $tarball " >&2 + + if [ -n "$COMPRESS_PROGRAM" ]; then + tarargs+=("--use-compress-program=$COMPRESS_PROGRAM") + fi + tarargs+=("-cf") + if [ "$INCHROOT" != "1" ]; then + tarargs+=("$PKGDEST/$tarball") + else + tarargs+=("../$tarball") + fi + tarargs+=('.PKGINFO' '.FILELIST') + for i in '.INSTALL' '.CHANGELOG'; do + if [ -f "$i" ]; then + tarargs+=("$i") + fi + done + tar "${tarargs[@]}" * +} + create_pkg() { local install @@ -546,28 +570,7 @@ create_pkg() msg2 ".FILELIST file... " >&2 tar cvf /dev/null * | sort >.FILELIST - # tar it up - msg2 "Compressing $1-$pkgver-$pkgrel-$CARCH.$PKG_EXT " >&2 - unset extra - if [ -f .INSTALL ]; then - extra=".INSTALL" - fi - if [ -f .CHANGELOG ]; then - extra="$extra .CHANGELOG" - fi - - case "$COMPRESS_PROGRAM" in - none) tarargs="-cf" ;; - *) tarargs="--use-compress-program=$COMPRESS_PROGRAM -cf" ;; - esac - - if [ "$INCHROOT" != "1" ]; then - tar $tarargs $PKGDEST/$1-$pkgver-$pkgrel-$CARCH.$PKG_EXT .PKGINFO .FILELIST \ - $extra * - else - tar $tarargs ../$1-$pkgver-$pkgrel-$CARCH.$PKG_EXT .PKGINFO .FILELIST \ - $extra * - fi + pkg_create_archive "$1" if [ "$SEARCHDEPS" == "1" ]; then if [ -x /usr/bin/chkdep ]; then _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
