diff options
Diffstat (limited to 'weed/shell')
| -rw-r--r-- | weed/shell/command_fs_mv.go | 3 | ||||
| -rw-r--r-- | weed/shell/commands.go | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/weed/shell/command_fs_mv.go b/weed/shell/command_fs_mv.go index c7c0984fc..0a7eed02d 100644 --- a/weed/shell/command_fs_mv.go +++ b/weed/shell/command_fs_mv.go @@ -4,7 +4,6 @@ import ( "context" "fmt" "io" - "path/filepath" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/util" @@ -65,7 +64,7 @@ func (c *commandFsMv) Do(args []string, commandEnv *CommandEnv, writer io.Writer // moving a file or folder if err == nil && respDestinationLookupEntry.Entry.IsDirectory { // to a directory - targetDir = filepath.ToSlash(filepath.Join(destinationDir, destinationName)) + targetDir = util.Join(destinationDir, destinationName) targetName = sourceName } else { // to a file or folder diff --git a/weed/shell/commands.go b/weed/shell/commands.go index 06b46b774..41f197328 100644 --- a/weed/shell/commands.go +++ b/weed/shell/commands.go @@ -4,7 +4,6 @@ import ( "fmt" "io" "net/url" - "path/filepath" "strconv" "strings" @@ -55,7 +54,7 @@ func (ce *CommandEnv) parseUrl(input string) (path string, err error) { return } if !strings.HasPrefix(input, "/") { - input = filepath.ToSlash(filepath.Join(ce.option.Directory, input)) + input = util.Join(ce.option.Directory, input) } return input, err } |