sync-res: proper matching on name
This commit is contained in:
parent
1b196370b3
commit
c97f76034a
@ -16,7 +16,7 @@ if [ -z "$1" ]; then
|
||||
die usage: $PROGNAME file.sync-conflict-XXXXXXXX-XXXXXX-XXXXXXX
|
||||
fi
|
||||
|
||||
ORIG=$(echo "$1" | sed 's/\.sync-conflict.*$//')
|
||||
ORIG=$(echo "$1" | sed -E 's/\.sync-conflict-[0-9]{8}-[0-9]{6}-[A-Z]{7}//')
|
||||
|
||||
if [ "$ORIG" = "$1" ]; then
|
||||
die Could not find original file. Is this a sync-conflict file?
|
||||
|
Loading…
Reference in New Issue
Block a user