cookutils rev 498

cook: Merge slitaz-tank branch create_tarball function into offical cook. Since $pkgsrc is in set_path function and $tarball is not used globally its better for $tarball to just be a local variable in create_tarball function.
author Christopher Rogers <slaxemulator@gmail.com>
date Tue Jun 19 21:18:04 2012 +0000 (2012-06-19)
parents 1469ccd94956
children abfee2306690
files cook
line diff
     1.1 --- a/cook	Tue Jun 19 18:05:06 2012 +0000
     1.2 +++ b/cook	Tue Jun 19 21:18:04 2012 +0000
     1.3 @@ -157,23 +157,24 @@
     1.4  
     1.5  # Create source tarball when URL is a SCM.
     1.6  create_tarball() {
     1.7 +	local tarball
     1.8 +	tarball=$pkgsrc.tar.bz2
     1.9 +	[ "$LZMA_SRC" ] && tarball=$lzma_tarball
    1.10  	gettext "Creating tarball: "; echo "$tarball"
    1.11 -	TARBALL=$tarball
    1.12  	if [ "$LZMA_SRC" ]; then
    1.13 -		tar -c $pkgsrc | lzma e $SRC/$tarball -si || exit 1
    1.14 +		tar -c $pkgsrc | lzma e $SRC/$tarball -si $LZMA_SET_DIR || exit 1
    1.15 +		LZMA_SRC=""
    1.16  	else
    1.17  		tar cjf $tarball $pkgsrc || exit 1
    1.18  		mv $tarball $SRC && rm -rf $pkgsrc
    1.19  	fi
    1.20 +	TARBALL=$tarball
    1.21  }
    1.22  
    1.23  # Get package source. For SCM we are in cache so clone here and create a
    1.24  # tarball here.
    1.25  get_source() {
    1.26  	pwd=$(pwd)
    1.27 -	pkgsrc=${SOURCE:-$PACKAGE}-$VERSION
    1.28 -	tarball=$pkgsrc.tar.bz2
    1.29 -	[ "$LZMA_SRC" ] && tarball=$pkgsrc.tar.lzma
    1.30  	case "$WGET_URL" in
    1.31  		http://*|ftp://*)
    1.32  			# Busybox Wget is better!