Commit 6b09b290 authored by Kevin Atkinson's avatar Kevin Atkinson

Revert "Resolve symlink if it is directly referenced in cli (#2897)"

This reverts commit fe7b01f14e2b8db6e856b567dbd7db4d00f6e366.

Conflicts:
	commands/cli/parse.go

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

This reverts commit 16c5a89dd44ea787f645e1fdfaf2e5b8ebb2945e, reversing
changes made to 8c77ff81886da887bc33f1c775a4f8881d1281b5.

Conflicts:
	commands/cli/parse.go

License: MIT
Signed-off-by: default avatarKevin Atkinson <k@kevina.org>
parent 72694ed6
......@@ -404,13 +404,7 @@ func appendFile(fpath string, argDef *cmds.Argument, recursive, hidden bool) (fi
fpath = cwd
}
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)
fpath = filepath.ToSlash(filepath.Clean(fpath))
stat, err := os.Lstat(fpath)
if err != nil {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment