From 4f653a02c887268700feb529c81e7d5b6bc7b86e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 18 Jun 2015 19:11:12 +0200
Subject: [PATCH] Don't hardcode global usage

---
 cmd/fdroidcl/main.go | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/cmd/fdroidcl/main.go b/cmd/fdroidcl/main.go
index 2e95d4d..c446725 100644
--- a/cmd/fdroidcl/main.go
+++ b/cmd/fdroidcl/main.go
@@ -59,15 +59,18 @@ func (c *Command) Usage() {
 
 func init() {
 	flag.Usage = func() {
-		fmt.Fprintln(os.Stderr, "Usage: fdroidcl [-h] <command> [<args>]")
-		fmt.Fprintln(os.Stderr)
-		fmt.Fprintln(os.Stderr, "Available commands:")
-		fmt.Fprintln(os.Stderr, "   update              Update the index")
-		fmt.Fprintln(os.Stderr, "   list                List all available apps")
-		fmt.Fprintln(os.Stderr, "   search <regexp...>  Search available apps")
-		fmt.Fprintln(os.Stderr, "   show <appid...>     Show detailed info of an app")
-		fmt.Fprintln(os.Stderr, "   devices             List connected devices")
-		fmt.Fprintln(os.Stderr, "   installed           List installed apps")
+		fmt.Fprintf(os.Stderr, "Usage: %s [-h] <command> [<args>]\n\n", cmdName)
+		fmt.Fprintf(os.Stderr, "Available commands:\n")
+		maxUsageLen := 0
+		for _, c := range commands {
+			if len(c.UsageLine) > maxUsageLen {
+				maxUsageLen = len(c.UsageLine)
+			}
+		}
+		for _, c := range commands {
+			fmt.Fprintf(os.Stderr, "   %s%s  %s\n", c.UsageLine,
+				strings.Repeat(" ", maxUsageLen-len(c.UsageLine)), c.Short)
+		}
 	}
 }