Add install before simplify when needed

BlythMeister · Jul 14, 2020 · d9efa80 · d9efa80
1 parent 2004169
commit d9efa80
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/src/PaketChain/Runner.cs b/src/PaketChain/Runner.cs
@@ -285,20 +285,25 @@ private static void PaketUpdate(RunnerArgs runnerArgs, CancellationToken cancell
 
         private static void PaketSimplify(RunnerArgs runnerArgs, CancellationToken cancellationToken, string rootDir, PaketInfo paketInfo, AdditionalArgs additionalArgs)
         {
-            if ((runnerArgs.SimplifyInteractive || runnerArgs.Simplify) && runnerArgs.Reinstall)
+            if (runnerArgs.SimplifyInteractive || runnerArgs.Simplify)
             {
-                PaketInstall(runnerArgs, cancellationToken, rootDir, paketInfo, additionalArgs);
-            }
+                if (runnerArgs.Reinstall || (string.IsNullOrWhiteSpace(runnerArgs.UpdatePackage) && !runnerArgs.Update))
+                {
+                    Console.WriteLine("Need to install before we can simplify");
+                    Console.WriteLine("-----------------------------------------------------");
+                    PaketInstall(runnerArgs, cancellationToken, rootDir, paketInfo, additionalArgs);
+                }
 
-            if (runnerArgs.SimplifyInteractive)
-            {
-                ConsoleHelper.RunPaketCommand(rootDir, paketInfo.PaketPath, paketInfo.ToolType, "simplify", $"--interactive {additionalArgs.PaketVerboseArgs} {runnerArgs.SimplifyArgs}", cancellationToken);
-                Console.WriteLine("-----------------------------------------------------");
-            }
-            else if (runnerArgs.Simplify)
-            {
-                ConsoleHelper.RunPaketCommand(rootDir, paketInfo.PaketPath, paketInfo.ToolType, "simplify", $"{additionalArgs.PaketVerboseArgs} {runnerArgs.SimplifyArgs}", cancellationToken);
-                Console.WriteLine("-----------------------------------------------------");
+                if (runnerArgs.SimplifyInteractive)
+                {
+                    ConsoleHelper.RunPaketCommand(rootDir, paketInfo.PaketPath, paketInfo.ToolType, "simplify", $"--interactive {additionalArgs.PaketVerboseArgs} {runnerArgs.SimplifyArgs}", cancellationToken);
+                    Console.WriteLine("-----------------------------------------------------");
+                }
+                else if (runnerArgs.Simplify)
+                {
+                    ConsoleHelper.RunPaketCommand(rootDir, paketInfo.PaketPath, paketInfo.ToolType, "simplify", $"{additionalArgs.PaketVerboseArgs} {runnerArgs.SimplifyArgs}", cancellationToken);
+                    Console.WriteLine("-----------------------------------------------------");
+                }
             }
         }