From 6df59d74910d8555e8f61bc11e4652f9d6d57ebf Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Sun, 23 May 2021 12:33:06 +0200 Subject: [PATCH] remote: treat paths as slash separated in triggerPaths() Remotes are only supported on UNIX systems which use slashes as path separators so this had no direct effect. Change it to make the code more obvious. This was forgotten in afb7e8e (safcm: use only slash separated paths for the configuration, 2021-05-13). --- remote/sync/triggers.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/remote/sync/triggers.go b/remote/sync/triggers.go index d201835..74d45c3 100644 --- a/remote/sync/triggers.go +++ b/remote/sync/triggers.go @@ -18,7 +18,7 @@ package sync import ( - "path/filepath" + slashpath "path" "strings" "ruderich.org/simon/safcm" @@ -50,7 +50,8 @@ func (s *Sync) queueTriggers(file *safcm.File) { // more specific triggers can override effects of less specific ones (first // "/" or ".", then the parents and finally path itself). func triggerPaths(path string) []string { - sep := string(filepath.Separator) + // Slash separated paths are used for the configuration + const sep = "/" if path == sep || path == "." { return []string{path} } @@ -65,7 +66,7 @@ func triggerPaths(path string) []string { var res []string for i := 0; i < len(parts); i++ { - res = append(res, filepath.Join(parts[:i+1]...)) + res = append(res, slashpath.Join(parts[:i+1]...)) } return res } -- 2.45.2