fix panics in acceptance tests

Signed-off-by: Kira Boyle <kboyle@vmware.com>

acceptance/help_test.go

@@ -42,4 +42,15 @@ var _ = Describe("help", func() {
 			Expect(session.Out.Contents()).Should(ContainSubstring(`om [OPTIONS] <command>`))
 		})
 	})
+
+	When("given the help command", func() {
+		It("prints the global usage", func() {
+			command := exec.Command(pathToMain, "help")
+			session, err := gexec.Start(command, GinkgoWriter, GinkgoWriter)
+			Expect(err).ToNot(HaveOccurred())
+
+			Eventually(session).Should(gexec.Exit(0))
+			Expect(session.Out.Contents()).Should(ContainSubstring(`om [OPTIONS] <command>`))
+		})
+	})
 })

cmd/loadConfigFile.go

@@ -14,6 +14,10 @@ import (
 // To load vars, VarsFile and/or VarsEnv must exist in the command struct being passed in.
 // If VarsEnv is used, envFunc must be defined instead of nil
 func loadConfigFile(args []string, envFunc func() []string) ([]string, error) {
+	if len(args) == 0 {
+		return args, nil
+	}
+
 	for _, cmdConfigBypassList := range []string{
 		"interpolate",
 		"configure-opsman",

cmd/main.go

@@ -55,6 +55,14 @@ func Main(sout io.Writer, serr io.Writer, version string, applySleepDurationStri
 
 	args, _ = parser.ParseArgs(args[1:])
 
+	if global.Version {
+		return commands.NewVersion(version, sout).Execute(nil)
+	}
+
+	if len(args) > 0 && args[0] == "help" {
+		args[0] = "--help"
+	}
+
 	err := setEnvFileProperties(&global)
 	if err != nil {
 		return err