Merge pull request opencontainers#88 from Sn0rt/add-help

Help: with more help information (Issues opencontainers#13)

Author: xiekeyang

cmd/oci-create-runtime-bundle/main.go

@@ -91,6 +91,16 @@ It is strongly recommended to keep the default value.`,
 		&v.version, "version", "v", false,
 		`Print version information and exit`,
 	)
+
+	origHelp := cmd.HelpFunc()
+
+	cmd.SetHelpFunc(func(c *cobra.Command, args []string) {
+		origHelp(c, args)
+		stdout.Println("\nMore information:")
+		stdout.Printf("\treferences\t%s\n", image.SpecURL)
+		stdout.Printf("\tbug report\t%s\n", image.IssuesURL)
+	})
+
 	return cmd
 }
 

cmd/oci-image-validate/main.go

@@ -89,6 +89,15 @@ func newValidateCmd(stdout, stderr *log.Logger) *cobra.Command {
 		`Print version information and exit`,
 	)
 
+	origHelp := cmd.HelpFunc()
+
+	cmd.SetHelpFunc(func(c *cobra.Command, args []string) {
+		origHelp(c, args)
+		stdout.Println("\nMore information:")
+		stdout.Printf("\treferences\t%s\n", image.SpecURL)
+		stdout.Printf("\tbug report\t%s\n", image.IssuesURL)
+	})
+
 	return cmd
 }
 

cmd/oci-unpack/main.go

@@ -84,6 +84,16 @@ func newUnpackCmd(stdout, stderr *log.Logger) *cobra.Command {
 		&v.version, "version", "v", false,
 		`Print version information and exit`,
 	)
+
+	origHelp := cmd.HelpFunc()
+
+	cmd.SetHelpFunc(func(c *cobra.Command, args []string) {
+		origHelp(c, args)
+		stdout.Println("\nMore information:")
+		stdout.Printf("\treferences\t%s\n", image.SpecURL)
+		stdout.Printf("\tbug report\t%s\n", image.IssuesURL)
+	})
+
 	return cmd
 }
 

image/project.go

@@ -0,0 +1,21 @@
+// Copyright 2016 The Linux Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package image
+
+// SpecURL is the URL for the image-spec repository
+var SpecURL = "https://github.com/opencontainers/image-spec"
+
+// IssuesURL is the URL for the issues of image-tools
+var IssuesURL = "https://github.com/opencontainers/image-tools/issues"