Merge pull request #13 from nizanrosh/fix/app-path

Fix/app path
nizanrosh · Jan 29, 2023 · 575f123 · 575f123
2 parents dad988e + 231c542
commit 575f123
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <VersionPrefix>1.3.1</VersionPrefix>
+    <VersionPrefix>1.3.2</VersionPrefix>
     <LangVersion>latest</LangVersion>
 
     <Authors>Nizan Rosh</Authors>

diff --git a/src/main/Installer/Program.cs b/src/main/Installer/Program.cs
@@ -24,7 +24,7 @@ await Spinner.StartAsync("Installing...", async spinner =>
         FileName = "dotnet",
         WorkingDirectory = "../",
         Arguments =
-            $"publish --output {output} --source https://api.nuget.org/v3/index.json --configuration Release --verbosity quiet"
+            $"publish --output {output} --source https://api.nuget.org/v3/index.json --configuration Release --verbosity quiet /property:WarningLevel=0"
     });
 
     await process!.WaitForExitAsync();
@@ -39,7 +39,7 @@ await Spinner.StartAsync("Installing...", async spinner =>
     var name = "PATH";
     var scope = EnvironmentVariableTarget.Machine;
     var oldValue = Environment.GetEnvironmentVariable(name, scope);
-
+    
     if (InstallerHelper.ShouldUpdateWindowsPaths(oldValue!, appPath))
     {
         var newPaths = InstallerHelper.GetNewWindowsPaths(oldValue!, appPath);
@@ -63,10 +63,7 @@ await Spinner.StartAsync("Installing...", async spinner =>
 {
     var pathsFile = "/etc/paths.d/okta-aws-cli";
 
-    if (!File.Exists(pathsFile))
-    {
-        await File.WriteAllTextAsync(pathsFile, appPath);
-    }
+    await File.WriteAllTextAsync(pathsFile, appPath);
 
     await InstallerHelper.MakeOacliExecutable(appPath);
 }

diff --git a/src/main/Okta.Aws.Cli/Cli/CliArgumentHandlerBase.cs b/src/main/Okta.Aws.Cli/Cli/CliArgumentHandlerBase.cs
@@ -27,10 +27,22 @@ public virtual async Task Handle(string[] args, CancellationToken cancellationTo
 
     private void CheckForUpdates()
     {
-        var versionInfo = Configuration.GetSection(nameof(VersionInfo)).Get<VersionInfo>();
-        if (versionInfo == null || string.Equals($"v{GetAppVersion()}", versionInfo.LatestVersion)) return;
-
-        PrintNewVersionAvailable(versionInfo);
+        try
+        {
+            var versionInfo = Configuration.GetSection(nameof(VersionInfo)).Get<VersionInfo>();
+            if (versionInfo == null) return;
+
+            var appVersion = new Version(GetAppVersion());
+            var latestFoundVersion = new Version(versionInfo.LatestVersion!.TrimStart('v'));
+
+            if (appVersion < latestFoundVersion == false) return;
+
+            PrintNewVersionAvailable(versionInfo);
+        }
+        catch (Exception)
+        {
+            //ignore
+        }
     }
 
     private void PrintNewVersionAvailable(VersionInfo versionInfo)

diff --git a/src/main/Okta.Aws.Cli/Program.cs b/src/main/Okta.Aws.Cli/Program.cs
@@ -55,10 +55,12 @@
     var relevantArgs = args.Where(arg => arg != "--debug").ToArray();
 
     var argumentFactory = provider.GetRequiredService<ICliArgumentFactory>();
-    await argumentFactory.GetHandler(args.ElementAtOrDefault(0)).Handle(relevantArgs, cts.Token);
+    var appTask = argumentFactory.GetHandler(args.ElementAtOrDefault(0)).Handle(relevantArgs, cts.Token);
 
     var versionService = provider.GetRequiredService<IVersionService>();
-    await versionService.ExecuteAsync(cts.Token);
+    var versionTask =  versionService.ExecuteAsync(cts.Token);
+
+    await Task.WhenAll(appTask, versionTask);
 }
 catch (Exception e)
 {