Merge pull request #513 from WildernessLabs/dfu-install-cleanup

Improved messaging when installing dfu
WildernessLabs · Mar 6, 2024 · e26f0ec · e26f0ec
2 parents d1b89af + 7c300a3
commit e26f0ec
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/Source/v2/Meadow.Cli/Commands/Current/Dfu/DfuInstallCommand.cs b/Source/v2/Meadow.Cli/Commands/Current/Dfu/DfuInstallCommand.cs
@@ -7,7 +7,7 @@
 
 namespace Meadow.CLI.Commands.DeviceManagement;
 
-[Command("dfu install", Description = "Deploys a built Meadow application to a target device")]
+[Command("dfu install", Description = "Install dfu-util to the host operating system")]
 public class DfuInstallCommand : BaseSettingsCommand<AppDeployCommand>
 {
     public const string DefaultVersion = "0.11";
@@ -44,11 +44,19 @@ protected override async ValueTask ExecuteCommand()
         {
             if (IsAdministrator())
             {
-                await DfuUtils.InstallDfuUtil(FileManager.WildernessTempFolderPath, Version, CancellationToken);
+                try
+                {
+                    await DfuUtils.InstallDfuUtil(FileManager.WildernessTempFolderPath, Version, CancellationToken);
+                }
+                catch (Exception ex)
+                {
+                    throw new CommandException($"Failed to install DFU {Version}: " + ex.Message);
+                }
+                Logger?.LogInformation($"DFU {Version} installed successfully");
             }
             else
             {
-                Logger?.LogError("To install DFU on Windows, you'll need to re-run the command from as an Administrator");
+                Logger?.LogError("To install DFU on Windows, you'll need to run the command as an Administrator");
             }
         }
         else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))

diff --git a/Source/v2/Meadow.Cli/Meadow.CLI.csproj b/Source/v2/Meadow.Cli/Meadow.CLI.csproj
@@ -10,7 +10,7 @@
 	  <Authors>Wilderness Labs, Inc</Authors>
 	  <Company>Wilderness Labs, Inc</Company>
 	  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-	  <PackageVersion>2.0.19.0</PackageVersion>
+	  <PackageVersion>2.0.20.0</PackageVersion>
 	  <Platforms>AnyCPU</Platforms>
 	  <PackageProjectUrl>http://developer.wildernesslabs.co/Meadow/Meadow.CLI/</PackageProjectUrl>
 	  <RepositoryUrl>https://github.com/WildernessLabs/Meadow.CLI</RepositoryUrl>

diff --git a/Source/v2/Meadow.Cli/Properties/AssemblyInfo.cs b/Source/v2/Meadow.Cli/Properties/AssemblyInfo.cs
@@ -6,6 +6,6 @@ namespace Meadow.CLI
 {
     public static class Constants
     {
-        public const string CLI_VERSION = "2.0.19.0";
+        public const string CLI_VERSION = "2.0.20.0";
     }
 }