Merge pull request #455 from adamralph/fix-work-dir-precedence

adamralph · web-flow · commit 7781bb923c4c · 2020-12-21T12:12:40.000+01:00
fix working directory precedence in CLI
diff --git a/minver-cli/Program.cs b/minver-cli/Program.cs
@@ -44,10 +44,13 @@ private static int Main(string[] args)
                     }
 #endif
 
-                    if (!string.IsNullOrEmpty(workDirArg.Value) && !Directory.Exists(workDir = workDirArg.Value))
+                    if (!string.IsNullOrEmpty(workDirArg.Value))
                     {
-                        Logger.ErrorWorkDirDoesNotExist(workDirArg.Value);
-                        return 2;
+                        if (!Directory.Exists(workDir = workDirArg.Value))
+                        {
+                            Logger.ErrorWorkDirDoesNotExist(workDirArg.Value);
+                            return 2;
+                        }
                     }
 #if MINVER_CLI
                     else if (!string.IsNullOrEmpty(workDirOption.Value()) && !Directory.Exists(workDir = workDirOption.Value()))

Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,13 @@ private static int Main(string[] args)`
`44`	`44`	`}`
`45`	`45`	`#endif`
`46`	`46`
`47`		`- if (!string.IsNullOrEmpty(workDirArg.Value) && !Directory.Exists(workDir = workDirArg.Value))`
	`47`	`+ if (!string.IsNullOrEmpty(workDirArg.Value))`
`48`	`48`	`{`
`49`		`- Logger.ErrorWorkDirDoesNotExist(workDirArg.Value);`
`50`		`- return 2;`
	`49`	`+ if (!Directory.Exists(workDir = workDirArg.Value))`
	`50`	`+ {`
	`51`	`+ Logger.ErrorWorkDirDoesNotExist(workDirArg.Value);`
	`52`	`+ return 2;`
	`53`	`+ }`
`51`	`54`	`}`
`52`	`55`	`#if MINVER_CLI`
`53`	`56`	`else if (!string.IsNullOrEmpty(workDirOption.Value()) && !Directory.Exists(workDir = workDirOption.Value()))`