From 3fcb9ae569bd3b4e7852b9d0f19d05b322d74eb7 Mon Sep 17 00:00:00 2001
From: Andrew Schwartzmeyer <andrew@schwartzmeyer.com>
Date: Thu, 21 Jan 2016 21:00:10 -0800
Subject: [PATCH] Fix up --help

Moved to argument parsing and cleaned up.
---
 src/Microsoft.PowerShell.Linux.Host/main.cs | 68 ++++++++++-----------
 1 file changed, 33 insertions(+), 35 deletions(-)

diff --git a/src/Microsoft.PowerShell.Linux.Host/main.cs b/src/Microsoft.PowerShell.Linux.Host/main.cs
index cd5235514..35429c21c 100644
--- a/src/Microsoft.PowerShell.Linux.Host/main.cs
+++ b/src/Microsoft.PowerShell.Linux.Host/main.cs
@@ -34,8 +34,40 @@ namespace Microsoft.PowerShell.Linux.Host
                     bool hasNext = (i+1) < args.Length;
                     string nextArg = hasNext ? args[i+1] : string.Empty;
 
+                    // --help was specified
+                    if (arg == "--help" || arg == "-h")
+                    {
+                        Console.WriteLine(@"
+usage: powershell[.exe] [ (--help | -h) ]
+                        [ (--file | -f) <filePath> ]
+                        [ <script>.ps1 ]
+                        [ (--command | -c) <string> ]
+
+SYNOPSIS
+
+    Open PowerShell console can take none or one of several arguments.
+
+OPTIONS
+
+    No arguments
+            Will launch PowerShell interactively.
+
+    (--file | -f) <filePath>
+            Given a file path, will execute as a PowerShell script.
+
+    <script>.ps1
+            Given a .ps1 script, will execute without needing --flag.
+
+    (--command | -c) <string>
+            Will execute given string as a PowerShell script.
+
+    (--help | -h)
+            Prints this text.
+");
+                        return;
+                    }
                     // lone argument is a script
-                    if (!hasNext && arg.EndsWith(".ps1"))
+                    else if (!hasNext && arg.EndsWith(".ps1"))
                     {
                         initialScript = Path.GetFullPath(arg);
                     }
@@ -180,40 +212,6 @@ namespace Microsoft.PowerShell.Linux.Host
             }
 
 
-            if (initialScript == "--help" || initialScript == "-h")
-            {
-                Console.WriteLine(@"
-======HELP======
-PowerShell for Linux
-Command Line Help Resource
-================
-
-TOPIC
-    PowerShell for Linux Command Line Arguments
-
-SYNOPSIS
-    PowerShell for Linux takes several command line arguments.
-
-OPTIONS
-
-    [NO ARGUMENTS]        Will launch PowerShell for Linux in an interactive shell.
-
-    --command <string>    Will execute given string as a PowerShell command.
-
-    -c <string>           Will execute given string as a PowerShell command.
-
-    --file <filePath>     Given a file path will execute as a PowerShell script.
-
-    -f <filePath>         Given a file path will execute as a PowerShell script.
-
-    --help                Prints a basic help of command line arguments for PowerShell on Linux
-
-    -h                    Prints a basic help of command line arguments for PowerShell on Linux.
-
-");
-		return;
-	    }
-
             try
             {
                 this.currentPowerShell.Runspace = this.myRunSpace;