From 7f276c6b772a1077dbe7c335830b1fdeed1d1919 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Sat, 20 Apr 2019 21:44:18 -0700 Subject: [PATCH] Fix soong_zip --help It was not printing out the flag descriptions because it was using the default FlagSet instead of the custom FlagSet when calling PrintDefaults. Test: soong_zip --help Change-Id: I8a5705f8701ce0c05dde144b9a14962faa384e65 --- zip/cmd/main.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/zip/cmd/main.go b/zip/cmd/main.go index b4f75f7af..6f40a3e0a 100644 --- a/zip/cmd/main.go +++ b/zip/cmd/main.go @@ -105,12 +105,6 @@ var ( nonDeflatedFiles = make(uniqueSet) ) -func usage() { - fmt.Fprintf(os.Stderr, "usage: soong_zip -o zipfile [-m manifest] [-C dir] [-f|-l file] [-D dir]...\n") - flag.PrintDefaults() - os.Exit(2) -} - func main() { var expandedArgs []string for _, arg := range os.Args { @@ -128,7 +122,11 @@ func main() { } flags := flag.NewFlagSet("flags", flag.ExitOnError) - flags.Usage = usage + flags.Usage = func() { + fmt.Fprintf(os.Stderr, "usage: soong_zip -o zipfile [-m manifest] [-C dir] [-f|-l file] [-D dir]...\n") + flags.PrintDefaults() + os.Exit(2) + } out := flags.String("o", "", "file to write zip file to") manifest := flags.String("m", "", "input jar manifest file name")