SliTaz Repositories

     1.1 --- a/cookiso	Sat Mar 17 15:03:23 2012 +0100
     1.2 +++ b/cookiso	Sat Mar 17 22:23:01 2012 +0100
     1.3 @@ -32,8 +32,7 @@
     1.4  		--pkgdb)
     1.5  			cook pkgdb --flavors ;;
     1.6  		--push)
     1.7 -			echo "TODO: Upload isos to mirror"
     1.8 -			exit 0 ;;
     1.9 +			push="yes" ;;
    1.10  		--flavors=*)
    1.11  			flavors=${opt#--flavors=} ;;
    1.12  		--version=*)
    1.13 @@ -136,16 +135,22 @@
    1.14  		cd $iso && md5sum $name.iso > $name.md5
    1.15  		echo "Cookiso ended: $(date '+%Y-%m-%d %H:%M')" | tee -a $log
    1.16  	done && echo ""
    1.17 +	# Push ISO to mirror if requested.
    1.18 +	[ "$push" ] && push_iso
    1.19  }
    1.20  
    1.21  # Push an ISO to a server.
    1.22  push_iso() {
    1.23  	echo "Pushing to host: ${SSH_HOST}"
    1.24 +	if echo $flavor | fgrep core-4in1; then
    1.25 +		file=slitaz-$string
    1.26 +	else
    1.27 +		file=slitaz-$string-$flavor
    1.28 +	fi
    1.29  	export DROPBEAR_PASSWORD=none
    1.30  	for flavor in $flavors
    1.31  	do
    1.32 -		rsync $BWLIMIT -vtP -e "$SSH_CMD" \
    1.33 -			$iso/slitaz-$string-$flavor.* \
    1.34 +		rsync $BWLIMIT -vtP -e "$SSH_CMD" $iso/$file.* \
    1.35  			${SSH_HOST}:$SSH_ISO/$string 2>&1 | tee $synclog
    1.36  	done
    1.37  }
    1.38 @@ -218,7 +223,7 @@
    1.39  		diff $last $pkgs > $diff 
    1.40  		if [ -s "$diff" ]; then
    1.41  			echo "Found new or rebuilt packages" | log_bot
    1.42 -			cat $diff >> $rollog
    1.43 +			cat $diff | grep "^+" >> $rollog
    1.44  			#
    1.45  			# TODO: Check new pkg and see if it's part of one of the rolling
    1.46  			# flavors, if not we have nothing to build.