impruve Konflict handling output
This commit is contained in:
parent
ff4bbb8b5e
commit
97189c59ff
11
select
11
select
@ -3,8 +3,13 @@
|
||||
cat vorhanden | cut -c -32 | while read line; do sed -i "/$line/d" 2cp ; done
|
||||
|
||||
#dateien die verschiedenen md5 haben aber bei beiden existieren als konflikte behandeln
|
||||
echo Konflicts:
|
||||
echo
|
||||
cat vorhanden | cut -c 35- | while read line; do
|
||||
l=$(grep " $line"$ 2cp | tee -a konflicts | cut -c -32)
|
||||
md5=$(echo $l | cut -c -32)
|
||||
sed -i "/$md5/d" 2cp
|
||||
l=$(grep " $line"$ 2cp | tee -a konflicts)
|
||||
[ -n "$l" ] && {
|
||||
echo $l
|
||||
md5=$(echo $l | cut -c -32)
|
||||
sed -i "/$md5/d" 2cp
|
||||
}
|
||||
done
|
||||
|
Loading…
Reference in New Issue
Block a user