Fix absolute paths when adding on Windows

djdv · djdv · commit 31b4cbb51fcd · 2016-07-31T16:50:49.000-04:00
License: MIT
Signed-off-by: Dominic Della Valle &lt;ddvpublic@gmail.com&gt;
diff --git a/commands/cli/parse.go b/commands/cli/parse.go
@@ -397,11 +397,12 @@ func appendFile(fpath string, argDef *cmds.Argument, recursive, hidden bool) (fi
 		fpath = cwd
 	}
 
-	fpath = filepath.ToSlash(filepath.Clean(fpath))
+	fpath = filepath.Clean(fpath)
 	fpath, err := filepath.EvalSymlinks(fpath)
 	if err != nil {
 		return nil, err
 	}
+	fpath = filepath.ToSlash(fpath)
 	stat, err := os.Lstat(fpath)
 	if err != nil {
 		return nil, err

Original file line number	Diff line number	Diff line change
`@@ -397,11 +397,12 @@ func appendFile(fpath string, argDef *cmds.Argument, recursive, hidden bool) (fi`
`397`	`397`	`fpath = cwd`
`398`	`398`	`}`
`399`	`399`
`400`		`- fpath = filepath.ToSlash(filepath.Clean(fpath))`
	`400`	`+ fpath = filepath.Clean(fpath)`
`401`	`401`	`fpath, err := filepath.EvalSymlinks(fpath)`
`402`	`402`	`if err != nil {`
`403`	`403`	`return nil, err`
`404`	`404`	`}`
	`405`	`+ fpath = filepath.ToSlash(fpath)`
`405`	`406`	`stat, err := os.Lstat(fpath)`
`406`	`407`	`if err != nil {`
`407`	`408`	`return nil, err`