cookutils diff cook @ rev 144

Handle CVS url
author Christophe Lincoln <pankso@slitaz.org>
date Wed May 11 18:29:49 2011 +0200 (2011-05-11)
parents c1f276ae5c0b
children 798f15f2cb06
line diff
     1.1 --- a/cook	Wed May 11 14:57:24 2011 +0200
     1.2 +++ b/cook	Wed May 11 18:29:49 2011 +0200
     1.3 @@ -171,9 +171,18 @@
     1.4  	_pkg=$install
     1.5  }
     1.6  
     1.7 +# Create source tarball when URL is a SCM.
     1.8 +create_tarball() {
     1.9 +	gettext "Creating tarball: "; echo "$tarball"
    1.10 +	tar cjf $tarball $pkgsrc || exit 1
    1.11 +	mv $tarball $SRC && rm -rf $pkgsrc
    1.12 +}
    1.13 +
    1.14  # Get package source.
    1.15  get_source() {
    1.16  	pwd=$(pwd)
    1.17 +	pkgsrc=${SOURCE:-$PACKAGE}-$VERSION
    1.18 +	tarball=$pkgsrc.tar.bz2
    1.19  	case "$WGET_URL" in
    1.20  		http://*|https://*|ftp://*)
    1.21  			# Busybox Wget is better!
    1.22 @@ -186,28 +195,30 @@
    1.23  			else
    1.24  				url=${WGET_URL#mercurial|}
    1.25  			fi
    1.26 -			pkgsrc=${SOURCE:-$PACKAGE}-$VERSION
    1.27 -			tarball=$pkgsrc.tar.bz2
    1.28  			gettext -e "Getting source from Hg...\n"
    1.29  			echo "URL: $url"
    1.30  			gettext "Cloning to: "; echo "$pwd/$pkgsrc"
    1.31  			hg clone $url $pkgsrc || (echo "ERROR: hg clone $url" && exit 1)
    1.32 -			gettext "Creating tarball: "; echo "$tarball"
    1.33 -			tar cjf $tarball $pkgsrc || exit 1
    1.34 -			mv $tarball $SRC && rm -rf $pkgsrc ;;
    1.35 +			create_tarball ;;
    1.36  		git*)
    1.37  			url=${WGET_URL#git|}
    1.38 -			pkgsrc=${SOURCE:-$PACKAGE}-$VERSION
    1.39 -			tarball=$pkgsrc.tar.bz2
    1.40  			gettext -e "Getting source from Git...\n"
    1.41  			echo "URL: $url"
    1.42  			git clone $url $pkgsrc || (echo "ERROR: git clone $url" && exit 1)
    1.43  			if [ "$BRANCH" ]; then
    1.44  				cd $pkgsrc && git checkout $BRANCH && cd ..	
    1.45  			fi
    1.46 -			gettext "Creating tarball: "; echo "$tarball"
    1.47 -			tar cjf $tarball $pkgsrc || exit 1
    1.48 -			mv $tarball $SRC && rm -rf $pkgsrc ;;
    1.49 +			create_tarball ;;
    1.50 +		cvs*)
    1.51 +			url=${WGET_URL#cvs|}
    1.52 +			mod=$PACKAGE
    1.53 +			[ "$CVS_MODULE" ] && mod=$CVS_MODULE
    1.54 +			gettext -e "Getting source from CVS...\n"
    1.55 +			echo "URL: $url"
    1.56 +			echo "CVS module: $mod"
    1.57 +			gettext "Cloning to: "; echo "$pwd/$mod"
    1.58 +			cvs -d:$url co $mod && mv $mod $pkgsrc
    1.59 +			create_tarball ;;
    1.60  		svn*|subversion*)
    1.61  			echo "TODO: svn implementation in cook" && exit 1 ;;
    1.62  		*)