Merge pull request ipfs#3023 from ipfs/feature/eval-symlink-windows

cli: do ToSlash after EvalSymlinks to remove platform specific slashes
ipfs-filestore · Aug 3, 2016 · 16c5a89 · 16c5a89
2 parents 8c77ff8 + 40741ea
commit 16c5a89
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/commands/cli/parse.go b/commands/cli/parse.go
@@ -397,11 +397,14 @@ 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
 	}
+	// Repeat ToSlash after EvalSymlinks as it turns path to platform specific
+	fpath = filepath.ToSlash(fpath)
+
 	stat, err := os.Lstat(fpath)
 	if err != nil {
 		return nil, err