Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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...");
Expand Down
21 changes: 20 additions & 1 deletion installer/Product.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -73,13 +76,29 @@
<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" />
<!-- 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 -->
<Feature Id="DefaultFeature" Level="1">
<ComponentRef Id="BootstrapMateExecutable" />
<ComponentGroupRef Id="GuiAppFiles" />
<ComponentRef Id="RegistryEntries" />
<ComponentRef Id="SetPathComponent" />
<ComponentRef Id="StartMenuShortcut" />
</Feature>

</Package>
Expand Down
Loading