From 189c2434770860d9cd49123ed2507a03d3b85231 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Wed, 18 Dec 2019 15:08:47 +0300
Subject: [PATCH] refactor

---
 .../Volo/Abp/Cli/Commands/UpdateCommand.cs    | 25 ++++---------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs
index 4ca4f848fd..3f55159756 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs
@@ -20,21 +20,12 @@ namespace Volo.Abp.Cli.Commands
 
         private readonly VoloNugetPackagesVersionUpdater _nugetPackagesVersionUpdater;
         private readonly NpmPackagesUpdater _npmPackagesUpdater;
-        private readonly ICliAnalyticsCollect _cliAnalyticsCollect;
-        private readonly AbpCliOptions _options;
-        private readonly IJsonSerializer _jsonSerializer;
 
         public UpdateCommand(VoloNugetPackagesVersionUpdater nugetPackagesVersionUpdater,
-            NpmPackagesUpdater npmPackagesUpdater,
-            ICliAnalyticsCollect cliAnalyticsCollect, 
-            IJsonSerializer jsonSerializer, 
-            IOptions<AbpCliOptions> options)
+            NpmPackagesUpdater npmPackagesUpdater)
         {
             _nugetPackagesVersionUpdater = nugetPackagesVersionUpdater;
             _npmPackagesUpdater = npmPackagesUpdater;
-            _cliAnalyticsCollect = cliAnalyticsCollect;
-            _jsonSerializer = jsonSerializer;
-            _options = options.Value;
 
             Logger = NullLogger<UpdateCommand>.Instance;
         }
@@ -44,24 +35,18 @@ namespace Volo.Abp.Cli.Commands
             var updateNpm = commandLineArgs.Options.ContainsKey(Options.Packages.Npm);
             var updateNuget = commandLineArgs.Options.ContainsKey(Options.Packages.NuGet);
 
-            var directory = commandLineArgs.Options.GetOrNull(Options.SolutionPath.Short, Options.SolutionPath.Long);
-            if (directory == null)
-            {
-                directory = Directory.GetCurrentDirectory();
-            }
+            var directory = commandLineArgs.Options.GetOrNull(Options.SolutionPath.Short, Options.SolutionPath.Long) ??
+                            Directory.GetCurrentDirectory();
 
-            var both = (updateNuget && updateNpm) || (!updateNuget && !updateNpm); 
-
-            if (updateNuget || both)
+            if (updateNuget || !updateNpm)
             {
                 await UpdateNugetPackages(commandLineArgs, directory);
             }
 
-            if (updateNpm || both)
+            if (updateNpm || !updateNuget)
             {
                 UpdateNpmPackages(directory);
             }
-
         }
 
         private void UpdateNpmPackages(string directory)