From 834e3c95056e26bcc1e1a44089d1d32766804a18 Mon Sep 17 00:00:00 2001
From: Carsten <Carsten@VWIN>
Date: Sat, 27 Aug 2016 13:51:25 +0200
Subject: [PATCH] Code cleanup

---
 Ntp.Analyzer.Cli/AssemblyInfo.cs |  2 +-
 Ntp.Analyzer.Cli/Program.cs      | 41 +++++++++++---------------------
 2 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/Ntp.Analyzer.Cli/AssemblyInfo.cs b/Ntp.Analyzer.Cli/AssemblyInfo.cs
index 664137e3..2cd142c1 100644
--- a/Ntp.Analyzer.Cli/AssemblyInfo.cs
+++ b/Ntp.Analyzer.Cli/AssemblyInfo.cs
@@ -21,6 +21,6 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.7.1.0")]
+[assembly: AssemblyVersion("0.7.2.0")]
 [assembly: AssemblyCopyright("Copyright (c) 2013-2016 Carsten Sonne Larsen <cs@innolan.dk>")]
 [assembly: AssemblyCulture("")]
\ No newline at end of file
diff --git a/Ntp.Analyzer.Cli/Program.cs b/Ntp.Analyzer.Cli/Program.cs
index 4ab2bb95..5394ee69 100644
--- a/Ntp.Analyzer.Cli/Program.cs
+++ b/Ntp.Analyzer.Cli/Program.cs
@@ -23,7 +23,6 @@ using System;
 using System.Globalization;
 using System.IO;
 using System.Threading;
-using Ntp.Analyzer.Common;
 using Ntp.Analyzer.Process;
 using Ntp.Common.IO;
 using Ntp.Common.Log;
@@ -33,54 +32,41 @@ namespace Ntp.Analyzer.Cli
 {
     public static class Program
     {
+        private static bool usage;
+
         public static void Main(string[] args)
         {
-            // Neutralize.
             Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
-
             string name = "ntpa";
             string tempDir = Directory.GetCurrentDirectory();
             string configFile = null;
             string pidFile = null;
-            bool exit = false;
 
-            LogGroup initlog = LogFactory.CreateErrorLog(name);
+            var initlog = LogFactory.CreateErrorLog(name);
             initlog.Add(LogFactory.CreateSysLog(name));
 
             var p = new OptionSet
             {
-                {
-                    "h|?|help", v =>
-                    {
-                        ShowUsage();
-                        exit = true;
-                    }
-                },
-                {
-                    "daemon=", v => { name = v; }
-                },
-                {
-                    "config=", v => { configFile = v; }
-                },
-                {
-                    "writepid=", v => { pidFile = v; }
-                },
-                {
-                    "temp=", v => { tempDir = v; }
-                }
+                {"h|?|help", v => { ShowUsage(); }},
+                {"daemon=", v => { name = v; }},
+                {"config=", v => { configFile = v; }},
+                {"writepid=", v => { pidFile = v; }},
+                {"temp=", v => { tempDir = v; }}
             };
 
-            string[] rem = p.Parse(args).ToArray();
+            var rem = p.Parse(args).ToArray();
 
-            if (exit)
+            if (usage)
             {
                 return;
             }
+
             if (rem.Length > 0)
             {
                 initlog.WriteLine("Unknown option: " + rem[0], Severity.Error);
                 return;
             }
+
             if (configFile == null)
             {
                 initlog.WriteLine("Please specify configuration file with option --config", Severity.Error);
@@ -104,8 +90,9 @@ namespace Ntp.Analyzer.Cli
 
         private static void ShowUsage()
         {
-            Console.WriteLine("NTP Analyzer " + VersionInfo.Text);
+            Console.WriteLine("NTP Analyzer v0.7.2");
             Console.WriteLine("Usage: ntpa --config file [--temp dir] [--writepid file] [--daemon name]");
+            usage = true;
         }
     }
 }
\ No newline at end of file