fix path bug on windows

fix usage
This commit is contained in:
guol-fnst 2022-06-16 16:52:57 +08:00
parent 995e221e97
commit cd078471c4

View file

@ -69,13 +69,13 @@ func init() {
path, _ := os.Executable() path, _ := os.Executable()
_, name := filepath.Split(path) _, name := filepath.Split(path)
updateOpt.dir = cmdUpdate.Flag.String("dir", filepath.Dir(path), "directory to save new weed.") updateOpt.dir = cmdUpdate.Flag.String("dir", filepath.Dir(path), "directory to save new weed.")
updateOpt.name = cmdUpdate.Flag.String("name", name, "name of new weed.On windows, name shouldn't be same to the orignial name.") updateOpt.name = cmdUpdate.Flag.String("name", name, "name of new weed. On windows, name shouldn't be same to the orignial name.")
updateOpt.Version = cmdUpdate.Flag.String("version", "0", "specific version of weed you want to download. If not specified, get the latest version.") updateOpt.Version = cmdUpdate.Flag.String("version", "0", "specific version of weed you want to download. If not specified, get the latest version.")
cmdUpdate.Run = runUpdate cmdUpdate.Run = runUpdate
} }
var cmdUpdate = &Command{ var cmdUpdate = &Command{
UsageLine: "update [-output=weed]", UsageLine: "weed update -dir=/path/to/dir -name=name -version=x.xx",
Short: "get latest or specific version from https://github.com/chrislusf/seaweedfs", Short: "get latest or specific version from https://github.com/chrislusf/seaweedfs",
Long: `get latest or specific version from https://github.com/chrislusf/seaweedfs`, Long: `get latest or specific version from https://github.com/chrislusf/seaweedfs`,
} }
@ -97,14 +97,15 @@ func runUpdate(cmd *Command, args []string) bool {
*updateOpt.name = name *updateOpt.name = name
} }
target := filepath.Join(*updateOpt.dir, *updateOpt.name)
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
if *updateOpt.name == name || *updateOpt.name == "" { if target == path {
glog.Fatalf("On windows, name of the new weed shouldn't be same to the orignial name.") glog.Fatalf("On windows, name of the new weed shouldn't be same to the orignial name.")
return false return false
} }
} }
target := *updateOpt.dir + "/" + *updateOpt.name
glog.V(0).Infof("new weed will be saved to %s", target) glog.V(0).Infof("new weed will be saved to %s", target)
_, err := downloadRelease(context.Background(), target, *updateOpt.Version) _, err := downloadRelease(context.Background(), target, *updateOpt.Version)