Merge pull request #358 from ahmetalpbalkan/usage-string-short

gmlewis · gmlewis · commit c427dedf7658 · 2015-03-27T14:42:43.000-07:00
Print only base binary name in usage string (win)
diff --git a/config.go b/config.go
@@ -178,7 +178,8 @@ func config() (*flag.FlagSet, error) {
 }
 
 func usageShort() {
-	fmt.Fprintf(os.Stderr, "Usage: %s [<options>] {help|init|up|ssh|save|down|poweroff|reset|restart|config|status|info|ip|shellinit|delete|download|upgrade|version} [<args>]\n", os.Args[0])
+	binName := filepath.Base(os.Args[0])
+	fmt.Fprintf(os.Stderr, "Usage: %s [<options>] {help|init|up|ssh|save|down|poweroff|reset|restart|config|status|info|ip|shellinit|delete|download|upgrade|version} [<args>]\n", binName)
 }
 
 func usageLong(flags *flag.FlagSet) {

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,8 @@ func config() (*flag.FlagSet, error) {`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`func usageShort() {`
`181`		`- fmt.Fprintf(os.Stderr, "Usage: %s [<options>] {help\|init\|up\|ssh\|save\|down\|poweroff\|reset\|restart\|config\|status\|info\|ip\|shellinit\|delete\|download\|upgrade\|version} [<args>]\n", os.Args[0])`
	`181`	`+ binName := filepath.Base(os.Args[0])`
	`182`	`+ fmt.Fprintf(os.Stderr, "Usage: %s [<options>] {help\|init\|up\|ssh\|save\|down\|poweroff\|reset\|restart\|config\|status\|info\|ip\|shellinit\|delete\|download\|upgrade\|version} [<args>]\n", binName)`
`182`	`183`	`}`
`183`	`184`
`184`	`185`	`func usageLong(flags *flag.FlagSet) {`