fix GlobToRegex for slash suffix

sonroyaalmerol · Dec 16, 2024 · eb7fa9f · eb7fa9f
1 parent 1ac8caa
commit eb7fa9f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/internal/backend/backup/jobrun.go b/internal/backend/backup/jobrun.go
@@ -198,7 +198,7 @@ func RunBackup(job *store.Job, storeInstance *store.Store, waitChan chan struct{
 			formattedTime := time.Now().Format(time.RFC3339)
 
 			select {
-			case <-logCtx.Done():
+			case <-ctx.Done():
 				if !taskHasError {
 					_, err := writer.WriteString(formattedTime + ": TASK OK\n")
 					if err != nil {

diff --git a/internal/utils/pattern_regex.go b/internal/utils/pattern_regex.go
@@ -15,6 +15,9 @@ func GlobToRegex(glob string) (string, error) {
 		glob = glob[1:]
 	}
 
+	glob = strings.TrimSuffix(glob, "/")
+	glob = strings.TrimSuffix(glob, "\\")
+
 	var regex strings.Builder
 	regex.WriteString(".*") // Match any path leading to the pattern