Catch exceptions in npkdiff.

LHCGreg · Aug 19, 2015 · 4330834 · 4330834
1 parent f435511
commit 4330834
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/npkdiff/CommandLineArgs.cs b/npkdiff/CommandLineArgs.cs
@@ -23,7 +23,16 @@ class CommandLineArgs
         public CommandLineArgs(string[] args)
         {
             OptionSet optionSet = GetOptionSet();
-            optionSet.Parse(args);
+
+            try
+            {
+                optionSet.Parse(args);
+            }
+            catch (OptionException ex)
+            {
+                Console.Error.WriteLine(ex.Message);
+                Environment.Exit(1);
+            }
 
             if (ShowHelp)
             {

diff --git a/npkdiff/Program.cs b/npkdiff/Program.cs
@@ -13,16 +13,23 @@ class Program
     {
         static void Main(string[] args)
         {
-            CommandLineArgs cmdline = new CommandLineArgs(args);
+            try
+            {
+                CommandLineArgs cmdline = new CommandLineArgs(args);
 
-            // read *.NPK in NpkDir1
-            // read *.NPK in NpkDir2
-            // Compare
+                // read *.NPK in NpkDir1
+                // read *.NPK in NpkDir2
+                // Compare
 
-            NpkDirContents dir1Contents = GetNpkDirContents(cmdline.NpkDir1);
-            NpkDirContents dir2Contents = GetNpkDirContents(cmdline.NpkDir2);
-            NpkDirDifferences differences = dir1Contents.GetDifferences(dir2Contents);
-            DisplayDifferences(differences);
+                NpkDirContents dir1Contents = GetNpkDirContents(cmdline.NpkDir1);
+                NpkDirContents dir2Contents = GetNpkDirContents(cmdline.NpkDir2);
+                NpkDirDifferences differences = dir1Contents.GetDifferences(dir2Contents);
+                DisplayDifferences(differences);
+            }
+            catch (Exception ex)
+            {
+                Console.Error.WriteLine("Unexpected error: {0}", ex.Message);
+            }
         }
 
         static NpkDirContents GetNpkDirContents(string npkDir)