tazlito rev 224

merge: check devices
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Jun 06 16:21:17 2011 +0200 (2011-06-06)
parents 047ed1296a6c
children 54166fa3cdd4
files tazlito
line diff
     1.1 --- a/tazlito	Sun Jun 05 15:02:51 2011 +0200
     1.2 +++ b/tazlito	Mon Jun 06 16:21:17 2011 +0200
     1.3 @@ -481,17 +481,21 @@
     1.4  			[ "$(dirname $(dirname $file))" == \
     1.5  			  ".$INSTALLED" ] && rm -f $2/$file
     1.6  		elif [ -b $1/$file ]; then
     1.7 -			[ -b $2/$file ] && rm -f $2/$file
     1.8 +			[ -b $2/$file ] &&
     1.9 +			[ "$(stat -c '%a:%u:%g:%t:%T' $1/$file)" == 
    1.10 +			  "$(stat -c '%a:%u:%g:%t:%T' $2/$file)" ] && 
    1.11 +			rm -f $2/$file
    1.12  		elif [ -c $1/$file ]; then
    1.13 -			[ -c $2/$file ] && rm -f $2/$file
    1.14 +			[ -c $2/$file ] &&
    1.15 +			[ "$(stat -c '%a:%u:%g:%t:%T' $1/$file)" == 
    1.16 +			  "$(stat -c '%a:%u:%g:%t:%T' $2/$file)" ] && 
    1.17 +			rm -f $2/$file
    1.18  		fi
    1.19  	done
    1.20  	
    1.21  	# cleanup directories
    1.22 -	( cd $1; find ) | tac | while read file; do
    1.23 -		if [ -d $1/$file ]; then
    1.24 -			[ -d $2/$file ] && rmdir $2/$file 2> /dev/null
    1.25 -		fi
    1.26 +	( cd $1; find -type d ) | sed '1!G;h;$!d' | while read file; do
    1.27 +		[ -d $2/$file ] && rmdir $2/$file 2> /dev/null
    1.28  	done
    1.29  	true
    1.30  	status