tazwok rev 309

Improve display for update-wok
author Antoine Bodin <gokhlayeh@slitaz.org>
date Fri Feb 18 02:46:19 2011 +0100 (2011-02-18)
parents 47ee83c8f97a
children 24a8151aa105
files tazwok
line diff
     1.1 --- a/tazwok	Fri Feb 18 02:30:04 2011 +0100
     1.2 +++ b/tazwok	Fri Feb 18 02:46:19 2011 +0100
     1.3 @@ -2823,6 +2823,7 @@
     1.4  		# Pull and update a Hg wok.
     1.5  		get_options_list="local"
     1.6  		get_tazwok_config
     1.7 +		source_lib report
     1.8  		clean_wok=$LOCAL_REPOSITORY/clean-wok
     1.9  		cd $clean_wok
    1.10  		if ! [ "$local" ]; then
    1.11 @@ -2839,13 +2840,16 @@
    1.12  					fi
    1.13  
    1.14  				fi
    1.15 +				report step "Getting wok changes using hg"
    1.16  				if [ -d .hg ]; then
    1.17  					hg pull -u || exit 1
    1.18  				else
    1.19  					hg clone $HG_WOK . || exit 1
    1.20  				fi
    1.21 +				report end-step
    1.22  				[ -x /usr/bin/clean-chroot ] && clean-chroot
    1.23  			else
    1.24 +				report step "Getting wok changes using tarball"
    1.25  				{ mkdir .tmp && cd .tmp
    1.26  					wget "$TARBALL_WOK" &&
    1.27  					case $TARBALL_WOK in
    1.28 @@ -2858,9 +2862,12 @@
    1.29  					cd .. &&
    1.30  					rm -r .tmp
    1.31  				} || { echo "That's not cool: it fails!" >&2
    1.32 +				report end-step
    1.33  				exit 1; }
    1.34 +				report end-step
    1.35  			fi
    1.36  		fi
    1.37 +		report step "Appending changes to wok"
    1.38  
    1.39  		# Handle removed files/dir.
    1.40  		cd $WOK	
    1.41 @@ -2875,6 +2882,7 @@
    1.42  		done
    1.43  
    1.44  		cp -a $clean_wok/* $WOK
    1.45 +		report end-step
    1.46  	;;
    1.47  	maintainers)
    1.48  		get_tazwok_config