From b29220047e6783064c030324e55bd6c530cc1594 Mon Sep 17 00:00:00 2001
From: Jess Frazelle <acidburn@microsoft.com>
Date: Mon, 16 Jul 2018 06:18:21 -0400
Subject: [PATCH] fixes

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
---
 Gopkg.lock                                    |  4 +-
 server/templates/vulns.html                   |  2 +-
 vendor/github.com/genuinetools/pkg/cli/cli.go | 37 ++++++++++++++++++-
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index f131fb4a..7e364942 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -190,11 +190,11 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:72ababdf871b47fe0d8f465b549cb487786160c2216aa14587acad047fdb051a"
+  digest = "1:26bac590d2ee7a8ace363d3b8f84e3f790e732470ba54995c9bf722827fc96c4"
   name = "github.com/genuinetools/pkg"
   packages = ["cli"]
   pruneopts = "NUT"
-  revision = "6c9354aa29e8454896b79b212e7053211f815349"
+  revision = "3654fc151753f8cd41b366e0c15b9fa070890ddf"
 
 [[projects]]
   digest = "1:38e684375ef5b55e812332266d63f9fc5b6329ab303067c4cdda051db6d29ca4"
diff --git a/server/templates/vulns.html b/server/templates/vulns.html
index dfc4c350..69891684 100644
--- a/server/templates/vulns.html
+++ b/server/templates/vulns.html
@@ -63,7 +63,7 @@
         {{end}}
         {{end}}
 
-        <footer class"text-center">
+        <footer class="text-center">
             <p>Made with <code><3</code> by <a href="https://github.com/jessfraz">@jessfraz</a></p>
             <p>Checkout the source code at: <a href="https://github.com/genuinetools/reg">github.com/genuinetools/reg</a></p>
         </footer>
diff --git a/vendor/github.com/genuinetools/pkg/cli/cli.go b/vendor/github.com/genuinetools/pkg/cli/cli.go
index 9e409a20..0ffa2791 100644
--- a/vendor/github.com/genuinetools/pkg/cli/cli.go
+++ b/vendor/github.com/genuinetools/pkg/cli/cli.go
@@ -272,10 +272,16 @@ func (p *Program) resetCommandUsage(command Command) {
 	}
 }
 
+type mflag struct {
+	name     string
+	defValue string
+}
+
 func resetFlagUsage(fs *flag.FlagSet) {
 	var (
 		hasFlags   bool
 		flagBlock  bytes.Buffer
+		flagMap    = map[string]mflag{}
 		flagWriter = tabwriter.NewWriter(&flagBlock, 0, 4, 2, ' ', 0)
 	)
 
@@ -291,13 +297,40 @@ func resetFlagUsage(fs *flag.FlagSet) {
 
 		// Add a double dash if the name is only one character long.
 		name := f.Name
-		if len(f.Name) > 1 {
+		if len(name) > 1 {
 			name = "-" + name
 		}
 
-		fmt.Fprintf(flagWriter, "\t-%s\t%s (default: %s)\n", f.Name, f.Usage, defValue)
+		// Try and find duplicates (or the shortcode flags and combine them.
+		// Like: -, --password
+		v, ok := flagMap[f.Usage]
+		if !ok {
+			flagMap[f.Usage] = mflag{
+				name:     name,
+				defValue: defValue,
+			}
+
+			// Return here.
+			return
+		}
+
+		if len(v.name) <= 2 {
+			// We already had the shortcode, let's append.
+			v.name = fmt.Sprintf("%s, -%s", v.name, name)
+		} else {
+			v.name = fmt.Sprintf("%s, -%s", name, v.name)
+		}
+
+		flagMap[f.Usage] = mflag{
+			name:     v.name,
+			defValue: defValue,
+		}
 	})
 
+	for desc, fm := range flagMap {
+		fmt.Fprintf(flagWriter, "\t-%s\t%s (default: %s)\n", fm.name, desc, fm.defValue)
+	}
+
 	flagWriter.Flush()
 
 	if !hasFlags {