From ea4302e45d7ae2423552acd362e893aa7f5bbee6 Mon Sep 17 00:00:00 2001
From: verhoek <hendrik@natural-transformations.com>
Date: Wed, 23 May 2018 19:52:11 +0200
Subject: [PATCH] Rewrote parsing aliases of parameter file option in a loop.

---
 Duplicati/CommandLine/Program.cs | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/Duplicati/CommandLine/Program.cs b/Duplicati/CommandLine/Program.cs
index dc22314e1..697a05f9b 100644
--- a/Duplicati/CommandLine/Program.cs
+++ b/Duplicati/CommandLine/Program.cs
@@ -170,27 +170,17 @@ namespace Duplicati.CommandLine
                 return Commands.Help(outwriter, setup, cargs, options, filter);
             }
 
-            if ((options.ContainsKey("parameters-file") && !string.IsNullOrEmpty("parameters-file")) || (options.ContainsKey("parameter-file") && !string.IsNullOrEmpty("parameter-file")) || (options.ContainsKey("parameterfile") && !string.IsNullOrEmpty("parameterfile")))
+            // try and parse all parameter file aliases
+            foreach (string parameterOption in new []{ "parameters-file", "parameters-file", "parameterfile"} )
             {
-                string filename;
-                if (options.ContainsKey("parameters-file") && !string.IsNullOrEmpty("parameters-file"))
+                if (options.ContainsKey(parameterOption) && !string.IsNullOrEmpty(options[parameterOption]))
                 {
-                    filename = options["parameters-file"];
-                    options.Remove("parameters-file");
-                }
-                else if (options.ContainsKey("parameter-file") && !string.IsNullOrEmpty("parameter-file"))
-                {
-                    filename = options["parameter-file"];
-                    options.Remove("parameter-file");
-                }
-                else
-                {
-                    filename = options["parameterfile"];
-                    options.Remove("parameterfile");
-                }
-
-                if (!ReadOptionsFromFile(outwriter, filename, ref filter, cargs, options))
-                    return 100;
+                    string filename = options[parameterOption];
+                    options.Remove(parameterOption);
+                    if (!ReadOptionsFromFile(outwriter, filename, ref filter, cargs, options))
+                        return 100;
+                    break;
+                }  
             }
 
             if (!options.ContainsKey("passphrase"))