From 9f57f3d1b3afc3b4024a30dfac70fbde20699108 Mon Sep 17 00:00:00 2001
From: Rod Christiansen <rchristiansen@ecuad.ca>
Date: Thu, 28 May 2026 12:34:38 -0700
Subject: [PATCH 1/2] fix: add Start Menu shortcut for GUI; KB display for
 sub-MB downloads

- Product.wxs: add ProgramMenuFolder\BootstrapMate\BootstrapMate.lnk
  targeting [INSTALLDIR]BootstrapMate.exe (harvested GUI binary)
- Program.cs: switch download size readout to KB when <1MB so small
  config MSIs no longer report 'Downloaded: 0.0 MB'
---
 Program.cs            |  7 +++++--
 installer/Product.wxs | 20 +++++++++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/Program.cs b/Program.cs
index cdb3160..f126c4d 100644
--- a/Program.cs
+++ b/Program.cs
@@ -992,8 +992,11 @@ static async Task DownloadAndInstallPackage(string displayName, string url, stri
                 await Task.Delay(100);
                 
                 var fileInfo = new FileInfo(localPath);
-                Logger.Debug($"Downloaded {displayName} to: {localPath} (Size: {fileInfo.Length / 1024 / 1024:F2} MB)");
-                Logger.WriteSubProgress("Downloaded", $"{fileInfo.Length / 1024 / 1024:F1} MB");
+                var sizeText = fileInfo.Length < 1024 * 1024
+                    ? $"{fileInfo.Length / 1024.0:F1} KB"
+                    : $"{fileInfo.Length / 1024.0 / 1024:F1} MB";
+                Logger.Debug($"Downloaded {displayName} to: {localPath} (Size: {sizeText})");
+                Logger.WriteSubProgress("Downloaded", sizeText);
                 
                 // Install based on type
                 Logger.Debug($"Installing {displayName} using {type} installer...");
diff --git a/installer/Product.wxs b/installer/Product.wxs
index 1e9fb8c..ace3559 100644
--- a/installer/Product.wxs
+++ b/installer/Product.wxs
@@ -36,6 +36,9 @@
     <StandardDirectory Id="ProgramFiles64Folder">
       <Directory Id="INSTALLDIR" Name="BootstrapMate" />
     </StandardDirectory>
+    <StandardDirectory Id="ProgramMenuFolder">
+      <Directory Id="ApplicationProgramsFolder" Name="BootstrapMate" />
+    </StandardDirectory>
 
     <!-- Main Application Files -->
     <Component Id="BootstrapMateExecutable" Directory="INSTALLDIR" Guid="47855CCD-7EAB-464C-A795-26091DE8B83A">
@@ -73,13 +76,28 @@
     <Component Id="SetPathComponent" Guid="D4E5F6A7-B8C9-0123-DEF4-56789012345A">
       <Environment Id="UpdatePath" Name="PATH" Value="[INSTALLDIR]" Permanent="no" Part="last" Action="set" Separator=";" System="yes" />
     </Component>
-    
+
+    <!-- Start Menu shortcut for the BootstrapMate GUI app. Target is the
+         BootstrapMate.exe harvested into INSTALLDIR by Generate-GuiAppFiles.ps1;
+         we don't bind to its File Id since the deterministic id may change if
+         the source path ever moves. -->
+    <Component Id="StartMenuShortcut" Directory="ApplicationProgramsFolder" Guid="3F8B9D2A-7C4E-4B1A-9D2F-1A3B5C7E9D1F">
+      <Shortcut Id="BootstrapMateStartMenuShortcut"
+                Name="BootstrapMate"
+                Description="MDM-agnostic bootstrapping tool for Windows"
+                Target="[INSTALLDIR]BootstrapMate.exe"
+                WorkingDirectory="INSTALLDIR" />
+      <RemoveFolder Id="CleanupApplicationProgramsFolder" Directory="ApplicationProgramsFolder" On="uninstall" />
+      <RegistryValue Root="HKLM" Key="SOFTWARE\BootstrapMate" Name="StartMenuShortcutInstalled" Type="integer" Value="1" KeyPath="yes" />
+    </Component>
+
     <!-- Feature Definition -->
     <Feature Id="DefaultFeature" Level="1">
       <ComponentRef Id="BootstrapMateExecutable" />
       <ComponentGroupRef Id="GuiAppFiles" />
       <ComponentRef Id="RegistryEntries" />
       <ComponentRef Id="SetPathComponent" />
+      <ComponentRef Id="StartMenuShortcut" />
     </Feature>
 
   </Package>

From ef7a827e14f74394c01b681b095145db14aabe70 Mon Sep 17 00:00:00 2001
From: Rod Christiansen <rchristiansen@ecuad.ca>
Date: Thu, 28 May 2026 12:39:29 -0700
Subject: [PATCH 2/2] fix(wix): switch StartMenuShortcut KeyPath to HKCU
 (ICE38/43/57)

---
 installer/Product.wxs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/installer/Product.wxs b/installer/Product.wxs
index ace3559..9b72bd8 100644
--- a/installer/Product.wxs
+++ b/installer/Product.wxs
@@ -88,7 +88,8 @@
                 Target="[INSTALLDIR]BootstrapMate.exe"
                 WorkingDirectory="INSTALLDIR" />
       <RemoveFolder Id="CleanupApplicationProgramsFolder" Directory="ApplicationProgramsFolder" On="uninstall" />
-      <RegistryValue Root="HKLM" Key="SOFTWARE\BootstrapMate" Name="StartMenuShortcutInstalled" Type="integer" Value="1" KeyPath="yes" />
+      <!-- HKCU KeyPath required by MSI for shortcut-only components (ICE38/43/57). -->
+      <RegistryValue Root="HKCU" Key="Software\BootstrapMate" Name="StartMenuShortcutInstalled" Type="integer" Value="1" KeyPath="yes" />
     </Component>
 
     <!-- Feature Definition -->