haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrote parsing aliases of parameter file option in a loop.

Browse Source
This commit is contained in:
verhoek
2018-05-23 21:28:41 +02:00
parent 7556c3fa63
commit ea4302e45d
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/CommandLine/Program.cs
+9 -19
View File
@@ -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"))