cookutils rev 922

cooker: enable previous commit.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Jun 09 00:24:05 2017 +0300 (2017-06-09)
parents 71118129435e
children 5d6cbb571217
files cooker
line diff
     1.1 --- a/cooker	Thu Jun 08 23:51:29 2017 +0300
     1.2 +++ b/cooker	Fri Jun 09 00:24:05 2017 +0300
     1.3 @@ -540,14 +540,14 @@
     1.4  			if [ -d "$wok/$pkg/stuff" ]; then
     1.5  				if [ ! -d "$wok-hg/$pkg/stuff" ]; then
     1.6  					echo "Removing stuff: $pkg/stuff" | log_commits
     1.7 -					echo "rm -rf $wok/$pkg/stuff" | log_commits			# just for test now
     1.8 +					rm -rf $wok/$pkg/stuff
     1.9  				else
    1.10 -					for stuff_file in $(cd $wok/$pkg/stuff; find \( -type f -o -type l \) ); do
    1.11 +					for stuff_file in $(cd $wok/$pkg/stuff; find \( -type f -o -type l \) | sed 's|^\./||'); do
    1.12  						if [ ! -f "$wok-hg/$pkg/stuff/$stuff_file" -a \
    1.13  							 ! -h "$wok-hg/$pkg/stuff/$stuff_file" ]; then
    1.14  							echo "Removing file from stuff: $wok/$pkg/stuff/$stuff_file" | log_commits
    1.15 -							echo "rm -f $wok/$pkg/stuff/$stuff_file" | log_commits			# just for test now
    1.16 -							echo "rmdir --parents --ignore-fail-on-non-empty $(dirname "$wok/$pkg/stuff/$stuff_file")" | log_commits			# just for test now
    1.17 +							rm -f $wok/$pkg/stuff/$stuff_file
    1.18 +							rmdir --parents --ignore-fail-on-non-empty $(dirname "$wok/$pkg/stuff/$stuff_file")
    1.19  						fi
    1.20  					done
    1.21  				fi