Fix relative path finding (gobuffalo/buffalo#982) (#55)

strings.TrimPrefix can give the wrong result with case-insensitive paths. filepath.Rel usually works better.
gobuffalo · Mar 25, 2018 · 3402a16 · 3402a16
1 parent 09d0f14
commit 3402a16
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/box.go b/box.go
@@ -158,7 +158,10 @@ func (b Box) Walk(wf WalkFunc) error {
 			return errors.WithStack(err)
 		}
 		return filepath.Walk(base, func(path string, info os.FileInfo, err error) error {
-			cleanName := strings.TrimPrefix(path, base)
+			cleanName, err := filepath.Rel(base, path)
+			if err != nil {
+				cleanName = strings.TrimPrefix(path, base)
+			}
 			cleanName = filepath.ToSlash(filepath.Clean(cleanName))
 			cleanName = strings.TrimPrefix(cleanName, "/")
 			cleanName = filepath.FromSlash(cleanName)