From c97f76034a9c35866137f9342a8cd25be2e501c0 Mon Sep 17 00:00:00 2001
From: dogeystamp <dogeystamp@disroot.org>
Date: Mon, 30 Sep 2024 20:32:50 -0400
Subject: [PATCH] sync-res: proper matching on name

---
 src/dot_local/bin/executable_sync-res.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dot_local/bin/executable_sync-res.sh b/src/dot_local/bin/executable_sync-res.sh
index 2d497de..29502e9 100644
--- a/src/dot_local/bin/executable_sync-res.sh
+++ b/src/dot_local/bin/executable_sync-res.sh
@@ -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?