add detection of conflicts
This commit is contained in:
parent
82ea7c6720
commit
ff4bbb8b5e
8
select
8
select
@ -1,2 +1,10 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
#gleiche dateien anhand md5 aussortieren
|
||||||
cat vorhanden | cut -c -32 | while read line; do sed -i "/$line/d" 2cp ; done
|
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
|
||||||
|
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
|
||||||
|
done
|
||||||
|
Loading…
Reference in New Issue
Block a user