# HG changeset patch # User Christopher Rogers # Date 1340140684 0 # Node ID 58ba62efde6a39d3c3a2496787e8af134111bf7a # Parent 1469ccd949564efaa8eae88ae0aed7b000d915b4 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. diff -r 1469ccd94956 -r 58ba62efde6a cook --- a/cook Tue Jun 19 18:05:06 2012 +0000 +++ b/cook Tue Jun 19 21:18:04 2012 +0000 @@ -157,23 +157,24 @@ # Create source tarball when URL is a SCM. create_tarball() { + local tarball + tarball=$pkgsrc.tar.bz2 + [ "$LZMA_SRC" ] && tarball=$lzma_tarball gettext "Creating tarball: "; echo "$tarball" - TARBALL=$tarball if [ "$LZMA_SRC" ]; then - tar -c $pkgsrc | lzma e $SRC/$tarball -si || exit 1 + tar -c $pkgsrc | lzma e $SRC/$tarball -si $LZMA_SET_DIR || exit 1 + LZMA_SRC="" else tar cjf $tarball $pkgsrc || exit 1 mv $tarball $SRC && rm -rf $pkgsrc fi + TARBALL=$tarball } # Get package source. For SCM we are in cache so clone here and create a # tarball here. get_source() { pwd=$(pwd) - pkgsrc=${SOURCE:-$PACKAGE}-$VERSION - tarball=$pkgsrc.tar.bz2 - [ "$LZMA_SRC" ] && tarball=$pkgsrc.tar.lzma case "$WGET_URL" in http://*|ftp://*) # Busybox Wget is better!