From 185a916f5eae022b89cc310d895fd93cac2fa3eb Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Thu, 21 Jul 2016 15:00:07 -0700 Subject: [PATCH] adjusting command options --- weed/command/{copy.go => filer_copy.go} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename weed/command/{copy.go => filer_copy.go} (90%) diff --git a/weed/command/copy.go b/weed/command/filer_copy.go similarity index 90% rename from weed/command/copy.go rename to weed/command/filer_copy.go index 0e7109daf..2aa994f6f 100644 --- a/weed/command/copy.go +++ b/weed/command/filer_copy.go @@ -42,7 +42,7 @@ func init() { } var cmdCopy = &Command{ - UsageLine: "copy file_or_dir1 [file_or_dir2 file_or_dir3] http://localhost:8888/path/to/a/folder/", + UsageLine: "filer.copy file_or_dir1 [file_or_dir2 file_or_dir3] http://localhost:8888/path/to/a/folder/", Short: "copy one or a list of files to a filer folder", Long: `copy one or a list of files, or batch copy one whole folder recursively, to a filer folder @@ -75,13 +75,13 @@ func runCopy(cmd *Command, args []string) bool { fmt.Printf("The last argument should be a URL on filer: %v\n", err) return false } - if len(fileOrDirs) > 1 && !strings.HasSuffix(filerUrl.Path, "/") { - fmt.Println("Can not copy multiple items to a file. The last argument must be a folder ended with \"/\"") - return false + path := filerUrl.Path + if !strings.HasSuffix(path, "/") { + path = path + "/" } for _, fileOrDir := range fileOrDirs { - if !doEachCopy(fileOrDir, filerUrl.Host, filerUrl.Path) { + if !doEachCopy(fileOrDir, filerUrl.Host, path) { return false } } @@ -141,7 +141,7 @@ func doEachCopy(fileOrDir string, host string, path string) bool { return false } - fmt.Printf("Copy %s => http://%s/%s\n", fileOrDir, host, path) + fmt.Printf("Copy %s => http://%s%s\n", fileOrDir, host, path) return true }