# HG changeset patch # User Antoine Bodin # Date 1298214913 -3600 # Node ID 14d4617ed3d277689bcf614ee5d9fdd06b854232 # Parent 920447130d3868c70f44722e872e5964d8f23ade Fix update-wok (again) diff -r 920447130d38 -r 14d4617ed3d2 tazwok --- a/tazwok Sun Feb 20 09:33:41 2011 +0000 +++ b/tazwok Sun Feb 20 16:15:13 2011 +0100 @@ -2868,17 +2868,17 @@ echo "" >&2 echo "You need to install mercurial to get wok from hg (recommended). Oherwise, you can switch wok get method to \"tarball\" into $LOCAL_RESOSITORY/tazwok.conf (per-repository configuration, it not always exists) or /etc/slitaz/tazwok.conf (global configuration)." | fold -s >&2 echo "">&2 + exit 1 else tazpkg get-install mercurial fi + fi + report step "Getting wok changes using hg" + if [ -d .hg ]; then + hg pull -u || exit 1 else - report step "Getting wok changes using hg" - if [ -d .hg ]; then - hg pull -u || exit 1 - else - hg clone $HG_WOK . || exit 1 - fi + hg clone $HG_WOK . || exit 1 fi report end-step [ -x /usr/bin/clean-chroot ] && clean-chroot @@ -2906,15 +2906,12 @@ # Handle removed files/dir. cd $WOK for dir in *; do - [ -d $dir ] || continue [ -d "$clean_wok/$dir" ] || rm -rf $dir done for file in */receipt */description.txt; do - [ -f $file ] || continue [ -f "$clean_wok/$file" ] || rm -rf $file done - for i in $(find */stuff); do - [ -e $i ] || continue + for i in $(find */stuff 2>/dev/null); do [ -e "$clean_wok/$i" ] || rm -rf $i done @@ -3263,4 +3260,4 @@ esac report stop 2>/dev/null -exit 0 \ No newline at end of file +exit 0