migrate fix command

git-svn-id: https://weed-fs.googlecode.com/svn/trunk@63 282b0af5-e82d-9cf1-ede4-77906d7719d0
This commit is contained in:
chris.lu@gmail.com
2012-08-07 01:20:26 +00:00
parent 51860424a6
commit 3f1136c194
4 changed files with 86 additions and 48 deletions

View File

@@ -14,6 +14,7 @@ import (
)
var commands = []*Command{
cmdFix,
cmdVersion,
}
@@ -46,13 +47,14 @@ func main() {
for _, cmd := range commands {
if cmd.Name() == args[0] && cmd.Run != nil {
cmd.Flag.Usage = func() { cmd.Usage() }
if cmd.CustomFlags {
args = args[1:]
} else {
cmd.Flag.Parse(args[1:])
args = cmd.Flag.Args()
cmd.Flag.Parse(args[1:])
args = cmd.Flag.Args()
if !cmd.Run(cmd, args) {
fmt.Fprintf(os.Stderr, "Default Parameters:\n")
cmd.Flag.PrintDefaults()
fmt.Fprintf(os.Stderr, "\n")
cmd.Flag.Usage()
}
cmd.Run(cmd, args)
exit()
return
}
@@ -63,7 +65,7 @@ func main() {
exit()
}
var usageTemplate = `Go is a tool for managing Go source code.
var usageTemplate = `WeedFS is a software to store billions of files and serve them fast!
Usage:
@@ -83,9 +85,9 @@ Use "weed help [topic]" for more information about that topic.
`
var helpTemplate = `{{if .Runnable}}usage: weed {{.UsageLine}}
{{end}}{{.Long | trim}}
var helpTemplate = `{{if .Runnable}}Usage: weed {{.UsageLine}}
{{end}}
{{.Long}}
`
// tmpl executes the given template text on data, writing the result to w.
@@ -154,16 +156,6 @@ func exit() {
os.Exit(exitStatus)
}
func fatalf(format string, args ...interface{}) {
errorf(format, args...)
exit()
}
func errorf(format string, args ...interface{}) {
log.Printf(format, args...)
setExitStatus(1)
}
var logf = log.Printf
func exitIfErrors() {
@@ -171,20 +163,3 @@ func exitIfErrors() {
exit()
}
}
// stringList's arguments should be a sequence of string or []string values.
// stringList flattens them into a single []string.
func stringList(args ...interface{}) []string {
var x []string
for _, arg := range args {
switch arg := arg.(type) {
case []string:
x = append(x, arg...)
case string:
x = append(x, arg)
default:
panic("stringList: invalid argument")
}
}
return x
}