From 963c0a17aab096d3c29394adf845fdcf471904f6 Mon Sep 17 00:00:00 2001 From: Chris Titus Date: Wed, 16 Apr 2025 08:56:22 -0500 Subject: [PATCH] Tidy up preference file changes --- functions/private/Set-PackageManagerPreference.ps1 | 14 ++++++-------- scripts/main.ps1 | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/functions/private/Set-PackageManagerPreference.ps1 b/functions/private/Set-PackageManagerPreference.ps1 index 9b4fedc9..2754c097 100644 --- a/functions/private/Set-PackageManagerPreference.ps1 +++ b/functions/private/Set-PackageManagerPreference.ps1 @@ -24,18 +24,16 @@ function Set-PackageManagerPreference { $preferedPackageManager = [PackageManagers]::Choco Remove-Item -Path $oldChocoPath } - else { + elseif (Test-Path -Path $preferencePath) { $potential = Get-Content -Path $preferencePath -TotalCount 1 - if ($potential) - {$preferedPackageManager = [PackageManagers]$potential} + $preferedPackageManager = [PackageManagers]$potential + } + else { + Write-Debug "Creating new preference file, defaulting to winget." + $preferedPackageManager = [PackageManagers]::Winget } } - #If no preference argument, .ini file bad read, and $sync empty then default to winget. - if ($null -eq $preferedPackageManager -and $null -eq $sync["ManagerPreference"]) - { $preferedPackageManager = [PackageManagers]::Winget } - - $sync["ManagerPreference"] = [PackageManagers]::$preferedPackageManager Write-Debug "Manager Preference changed to '$($sync["ManagerPreference"])'" diff --git a/scripts/main.ps1 b/scripts/main.ps1 index 55ec05d6..31c48f99 100644 --- a/scripts/main.ps1 +++ b/scripts/main.ps1 @@ -219,7 +219,7 @@ function Update-AppTileProperties { $sync.Form.Resources.AppTileMargins = [Windows.Thickness]2 $sync.Form.Resources.AppTileBorderThickness = [Windows.Thickness]0 } - else { + else { # On first load, set the AppTileWidth to NaN because the Window dosnt exist yet and there is no ActuaWidth if ($sync.ItemsControl.ActualWidth -gt 0) { $sync.Form.Resources.AppTileWidth = $sync.ItemsControl.ActualWidth -20}