Merge branch 'master' into resurrect

This commit is contained in:
Shlomi Noach 2016-12-30 07:59:21 +02:00
commit 856d0d487a

View File

@ -117,8 +117,13 @@ func main() {
stack := flag.Bool("stack", false, "add stack trace upon error") stack := flag.Bool("stack", false, "add stack trace upon error")
help := flag.Bool("help", false, "Display usage") help := flag.Bool("help", false, "Display usage")
version := flag.Bool("version", false, "Print version & exit") version := flag.Bool("version", false, "Print version & exit")
checkFlag := flag.Bool("check-flag", false, "Check if another flag exists/supported. This allows for cross-version scripting. Exits with 0 when all additional provided flags exist, nonzero otherwise. You must provide (dummy) values for flags that require a value. Example: gh-ost --check-flag --cut-over-lock-timeout-seconds --nice-ratio 0")
flag.Parse() flag.Parse()
if *checkFlag {
return
}
if *help { if *help {
fmt.Fprintf(os.Stderr, "Usage of gh-ost:\n") fmt.Fprintf(os.Stderr, "Usage of gh-ost:\n")
flag.PrintDefaults() flag.PrintDefaults()