mdiluz/rove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change "-version" to a command

Browse source
This commit is contained in:
Marc Di Luzio 2020-06-23 18:03:36 +01:00
parent 19b3685e8c
commit c268555e2e
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cmd/rove/main.go
View file

@ -27,6 +27,7 @@ func printUsage() {
fmt.Fprintln(os.Stderr, "\tradar \tgathers radar data for the current rover") fmt.Fprintln(os.Stderr, "\tradar \tgathers radar data for the current rover")
fmt.Fprintln(os.Stderr, "\trover \tgets data for current rover") fmt.Fprintln(os.Stderr, "\trover \tgets data for current rover")
fmt.Fprintln(os.Stderr, "\tconfig \toutputs the local config info") fmt.Fprintln(os.Stderr, "\tconfig \toutputs the local config info")
fmt.Fprintln(os.Stderr, "\tversion \toutputs version info")
fmt.Fprintln(os.Stderr, "\nOptions:") fmt.Fprintln(os.Stderr, "\nOptions:")
flag.PrintDefaults() flag.PrintDefaults()
} }
@ -37,7 +38,6 @@ var defaultData = path.Join(home, ".local/share/rove.json")
const gRPCport = 9090 const gRPCport = 9090
// General usage // General usage
var ver = flag.Bool("version", false, "Display version number")
var host = flag.String("host", "", "path to game host server") var host = flag.String("host", "", "path to game host server")
var data = flag.String("data", defaultData, "data file for storage") var data = flag.String("data", defaultData, "data file for storage")
@ -116,6 +116,9 @@ func InnerMain(command string) error {
// Handle all the commands // Handle all the commands
switch command { switch command {
case "version":
fmt.Println(version.Version)
case "status": case "status":
response, err := client.Status(ctx, &rove.StatusRequest{}) response, err := client.Status(ctx, &rove.StatusRequest{})
switch { switch {
@ -233,12 +236,6 @@ func main() {
flag.CommandLine.Parse(os.Args[2:]) flag.CommandLine.Parse(os.Args[2:])
// Print the version if requested
if *ver {
fmt.Println(version.Version)
return
}
// Run the inner main // Run the inner main
if err := InnerMain(os.Args[1]); err != nil { if err := InnerMain(os.Args[1]); err != nil {
fmt.Fprintf(os.Stderr, "Error: %s\n", err) fmt.Fprintf(os.Stderr, "Error: %s\n", err)