Fix -f flag when downloading OS and always write version.txt when not…

… specifying a version
WildernessLabs · Feb 12, 2024 · 8285502 · 8285502
1 parent d7170ff
commit 8285502
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/Source/v2/Meadow.Cli/Commands/Current/Firmware/FirmwareDownloadCommand.cs b/Source/v2/Meadow.Cli/Commands/Current/Firmware/FirmwareDownloadCommand.cs
@@ -1,10 +1,7 @@
 using CliFx.Attributes;
 using Meadow.Cloud.Client;
-using Meadow.Cloud.Client.Identity;
 using Meadow.Software;
 using Microsoft.Extensions.Logging;
-using System.Diagnostics;
-using System.Net.Http.Headers;
 
 namespace Meadow.CLI.Commands.DeviceManagement;
 
@@ -15,7 +12,7 @@ public class FirmwareDownloadCommand : BaseFileCommand<FirmwareDownloadCommand>
 
     public FirmwareDownloadCommand(
         FileManager fileManager,
-        IMeadowCloudClient meadowCloudClient, 
+        IMeadowCloudClient meadowCloudClient,
         ISettingsManager settingsManager,
         ILoggerFactory loggerFactory)
         : base(fileManager, settingsManager, loggerFactory)
@@ -61,6 +58,7 @@ protected override async ValueTask ExecuteCommand()
             }
 
             Logger?.LogInformation($"Latest available version is '{latest}'...");
+            await collection.SetDefaultPackage(latest);
             Version = latest;
         }
         else
@@ -77,7 +75,7 @@ protected override async ValueTask ExecuteCommand()
             return;
         }
 
-        if (collection[Version] != null)
+        if (collection[Version] != null && Force == false)
         {
             Logger?.LogInformation($"Firmware package '{Version}' already exists locally");
             return;
@@ -98,11 +96,6 @@ protected override async ValueTask ExecuteCommand()
             else
             {
                 Logger?.LogInformation($"Firmware package '{Version}' downloaded");
-
-                if (explicitVersion == false)
-                {
-                    await collection.SetDefaultPackage(Version);
-                }
             }
         }
         catch (Exception ex)

diff --git a/Source/v2/Meadow.Cli/Commands/Legacy/DownloadOsCommand.cs b/Source/v2/Meadow.Cli/Commands/Legacy/DownloadOsCommand.cs
@@ -1,6 +1,5 @@
 using CliFx.Attributes;
 using Meadow.Cloud.Client;
-using Meadow.Cloud.Client.Identity;
 using Meadow.Software;
 using Microsoft.Extensions.Logging;