# HG changeset patch # User Pascal Bellard # Date 1292183367 -3600 # Node ID 299b9fda54e134f4503b884331b560c7fa95310b # Parent adc832723d07010de2d2163acef786fc4976e296 Fix remove with modifiers diff -r adc832723d07 -r 299b9fda54e1 tazpkg --- a/tazpkg Sun Dec 12 11:05:29 2010 +0000 +++ b/tazpkg Sun Dec 12 20:49:27 2010 +0100 @@ -1932,13 +1932,13 @@ fi gettext "Removing all files installed..." if [ -f $ROOT$INSTALLED/$PACKAGE/modifiers ]; then - for mod in `cat $ROOT$INSTALLED/$PACKAGE/modifiers` + for file in `cat $ROOT$INSTALLED/$PACKAGE/files.list` do - for file in `cat $ROOT$INSTALLED/$PACKAGE/files.list` + for mod in `cat $ROOT$INSTALLED/$PACKAGE/modifiers` do - [ $(grep "^$(echo $file | grepesc)$" $ROOT$INSTALLED/$mod/files.list | wc -l) -gt 1 ] && continue - remove_with_path $ROOT$file + [ $(grep "^$(echo $file | grepesc)$" $ROOT$INSTALLED/$mod/files.list | wc -l) -gt 1 ] && continue 2 done + remove_with_path $ROOT$file done else for file in `cat $ROOT$INSTALLED/$PACKAGE/files.list`