Skip to content

Commit 88c0f93

Browse files
committed
replacing filepath.Abs with filepath.Clean since using afero.Fs means no meaningful working directory
Signed-off-by: Jeff Lindsay <progrium@gmail.com>
1 parent 454f264 commit 88c0f93

File tree

1 file changed

+5
-20
lines changed

1 file changed

+5
-20
lines changed

watcher.go

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,7 @@ func (w *Watcher) Add(name string) (err error) {
199199
w.mu.Lock()
200200
defer w.mu.Unlock()
201201

202-
name, err = filepath.Abs(name)
203-
if err != nil {
204-
return err
205-
}
202+
name = filepath.Clean(name)
206203

207204
// If name is on the ignored list or if hidden files are
208205
// ignored and name is a hidden file or directory, simply return.
@@ -290,10 +287,7 @@ func (w *Watcher) AddRecursive(name string) (err error) {
290287
w.mu.Lock()
291288
defer w.mu.Unlock()
292289

293-
name, err = filepath.Abs(name)
294-
if err != nil {
295-
return err
296-
}
290+
name = filepath.Clean(name)
297291

298292
fileList, err := w.listRecursive(name)
299293
if err != nil {
@@ -353,10 +347,7 @@ func (w *Watcher) Remove(name string) (err error) {
353347
w.mu.Lock()
354348
defer w.mu.Unlock()
355349

356-
name, err = filepath.Abs(name)
357-
if err != nil {
358-
return err
359-
}
350+
name = filepath.Clean(name)
360351

361352
// Remove the name from w's names list.
362353
delete(w.names, name)
@@ -389,10 +380,7 @@ func (w *Watcher) RemoveRecursive(name string) (err error) {
389380
w.mu.Lock()
390381
defer w.mu.Unlock()
391382

392-
name, err = filepath.Abs(name)
393-
if err != nil {
394-
return err
395-
}
383+
name = filepath.Clean(name)
396384

397385
// Remove the name from w's names list.
398386
delete(w.names, name)
@@ -422,10 +410,7 @@ func (w *Watcher) RemoveRecursive(name string) (err error) {
422410
// For files that are already added, Ignore removes them.
423411
func (w *Watcher) Ignore(paths ...string) (err error) {
424412
for _, path := range paths {
425-
path, err = filepath.Abs(path)
426-
if err != nil {
427-
return err
428-
}
413+
path = filepath.Clean(path)
429414
// Remove any of the paths that were already added.
430415
if err := w.RemoveRecursive(path); err != nil {
431416
return err

0 commit comments

Comments
 (0)