From 297b3079e5fa48ca9a9e5fd1b8bfbbcbad1fbba6 Mon Sep 17 00:00:00 2001 From: CodingWonders <101426328+CodingWonders@users.noreply.github.com> Date: Mon, 8 Jun 2026 16:43:04 +0200 Subject: [PATCH] Fix slop remains (#4640) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix slop remains Chris likes to vibe code. AI likes to use different types of dashes (em-dashes, en-dashes), instead of regular dashes (-). On PowerShell 7 this appears to work. The parser doesn't care. But, what about PowerShell 5? It begins throwing errors about the ampersand. Loading it in the ISE reveals how it stops parsing the syntax correctly when it encounters em-dashes. Rather than displaying them as such, the ISE displays them as —. Chris, if you want to vibe code, I don't mind. But at least use regular dashes. Anyway, I won't fix the AI code. I just want to make it work on my beloved powershell 5. * Apparently this file is important --- .../Find-TweaksByNameOrDescription.ps1 | 36 +++++++++---------- functions/private/Invoke-WinUtilISO.ps1 | 4 +-- functions/private/Invoke-WinUtilISOScript.ps1 | 16 ++++----- functions/private/Reset-WPFCheckBoxes.ps1 | 2 +- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/functions/private/Find-TweaksByNameOrDescription.ps1 b/functions/private/Find-TweaksByNameOrDescription.ps1 index 497c33d7..06d60148 100644 --- a/functions/private/Find-TweaksByNameOrDescription.ps1 +++ b/functions/private/Find-TweaksByNameOrDescription.ps1 @@ -23,9 +23,9 @@ function Find-TweaksByNameOrDescription { [string]$SearchString = "" ) - # ────────────────────────────────────────────────────────────────────────────── + # ------------------------------------------------------------------------------ # 1. RESOLVE $SYNC WITH MULTI-LEVEL FALLBACK - # ────────────────────────────────────────────────────────────────────────────── + # ------------------------------------------------------------------------------ if ($null -eq $Sync) { $Sync = $global:sync @@ -45,9 +45,9 @@ function Find-TweaksByNameOrDescription { return } - # ────────────────────────────────────────────────────────────────────────────── + # ------------------------------------------------------------------------------ # 2. GET REFERENCE TO TWEAKS PANEL - # ────────────────────────────────────────────────────────────────────────────── + # ------------------------------------------------------------------------------ $tweaksPanel = $null try { @@ -63,9 +63,9 @@ function Find-TweaksByNameOrDescription { return } - # ────────────────────────────────────────────────────────────────────────────── + # ------------------------------------------------------------------------------ # 3. HANDLE EMPTY/WHITESPACE SEARCH STRING - RESET TO DEFAULT STATE - # ────────────────────────────────────────────────────────────────────────────── + # ------------------------------------------------------------------------------ if ([string]::IsNullOrWhiteSpace($SearchString)) { try { @@ -114,9 +114,9 @@ function Find-TweaksByNameOrDescription { return } - # ────────────────────────────────────────────────────────────────────────────── + # ------------------------------------------------------------------------------ # 4. PERFORM LITERAL SEARCH (NO WILDCARD EXPANSION) - # ────────────────────────────────────────────────────────────────────────────── + # ------------------------------------------------------------------------------ try { # Normalize search term once for the entire operation @@ -151,9 +151,9 @@ function Find-TweaksByNameOrDescription { continue } - # ──────────────────────────────────────────────────────────── + # ------------------------------------------------------------ # Check if this is a category label (usually first Label) - # ──────────────────────────────────────────────────────────── + # ------------------------------------------------------------ if ($item -is [Windows.Controls.Label]) { $categoryLabel = $item @@ -161,9 +161,9 @@ function Find-TweaksByNameOrDescription { $item.Visibility = [Windows.Visibility]::Collapsed } - # ──────────────────────────────────────────────────────────── + # ------------------------------------------------------------ # Check if this is a DockPanel containing a tweak checkbox - # ──────────────────────────────────────────────────────────── + # ------------------------------------------------------------ elseif ($item -is [Windows.Controls.DockPanel]) { $checkbox = $null @@ -211,9 +211,9 @@ function Find-TweaksByNameOrDescription { } } - # ──────────────────────────────────────────────────────────── + # ------------------------------------------------------------ # Check if this is a StackPanel containing a tweak checkbox - # ──────────────────────────────────────────────────────────── + # ------------------------------------------------------------ elseif ($item -is [Windows.Controls.StackPanel]) { $checkbox = $null @@ -257,9 +257,9 @@ function Find-TweaksByNameOrDescription { } } - # ──────────────────────────────────────────────────────────── + # ------------------------------------------------------------ # Update category label visibility and expanded/collapsed state - # ──────────────────────────────────────────────────────────── + # ------------------------------------------------------------ if ($categoryHasMatch) { # Show category label @@ -282,9 +282,9 @@ function Find-TweaksByNameOrDescription { } } - # ──────────────────────────────────────────────────────────────── + # ---------------------------------------------------------------- # Set category border visibility based on whether it has matches - # ──────────────────────────────────────────────────────────────── + # ---------------------------------------------------------------- if ($categoryHasMatch) { $categoryBorder.Visibility = [Windows.Visibility]::Visible diff --git a/functions/private/Invoke-WinUtilISO.ps1 b/functions/private/Invoke-WinUtilISO.ps1 index 37486720..8583bc6c 100644 --- a/functions/private/Invoke-WinUtilISO.ps1 +++ b/functions/private/Invoke-WinUtilISO.ps1 @@ -65,7 +65,7 @@ function Invoke-WinUtilISOMountAndVerify { if (-not (Test-Path $wimPath) -and -not (Test-Path $esdPath)) { Dismount-DiskImage -ImagePath $isoPath - Write-Win11ISOLog "ERROR: install.wim/install.esd not found — not a valid Windows ISO." + Write-Win11ISOLog "ERROR: install.wim/install.esd not found - not a valid Windows ISO." [System.Windows.MessageBox]::Show( "This does not appear to be a valid Windows ISO.`n`ninstall.wim / install.esd was not found.", "Invalid ISO", "OK", "Error") @@ -547,7 +547,7 @@ function Invoke-WinUtilISOCleanAndReset { Log "Temp directory deleted successfully." } } else { - Log "No temp directory found — resetting UI." + Log "No temp directory found - resetting UI." } SetProgress "Resetting UI..." 95 diff --git a/functions/private/Invoke-WinUtilISOScript.ps1 b/functions/private/Invoke-WinUtilISOScript.ps1 index 90376c22..a5c5abaf 100644 --- a/functions/private/Invoke-WinUtilISOScript.ps1 +++ b/functions/private/Invoke-WinUtilISOScript.ps1 @@ -108,7 +108,7 @@ function Invoke-WinUtilISOScript { } } - # ── 1. Remove provisioned AppX packages ────────────────────────────────── + # -- 1. Remove provisioned AppX packages ---------------------------------- & $Log "Removing provisioned AppX packages..." $packages = & dism /English "/image:$ScratchDir" /Get-ProvisionedAppxPackages | @@ -139,7 +139,7 @@ function Invoke-WinUtilISOScript { $packages | Where-Object { $pkg = $_; $packagePrefixes | Where-Object { $pkg -like "*$_*" } } | ForEach-Object { & dism /English "/image:$ScratchDir" /Remove-ProvisionedAppxPackage "/PackageName:$_" } - # ── 2. Inject current system drivers (optional) ─────────────────────────── + # -- 2. Inject current system drivers (optional) --------------------------- if ($InjectCurrentSystemDrivers) { & $Log "Exporting all drivers from running system..." $driverExportRoot = Join-Path $env:TEMP "WinUtil_DriverExport_$(Get-Random)" @@ -157,7 +157,7 @@ function Invoke-WinUtilISOScript { & $Log "Injecting current system drivers into boot.wim..." Invoke-BootWimInject -BootWimPath $bootWim -DriverDir $driverExportRoot -Logger $Log } else { - & $Log "Warning: boot.wim not found — skipping boot.wim driver injection." + & $Log "Warning: boot.wim not found - skipping boot.wim driver injection." } } } catch { @@ -169,7 +169,7 @@ function Invoke-WinUtilISOScript { & $Log "Driver injection skipped." } - # ── 3. Registry tweaks ──────────────────────────────────────────────────── + # -- 3. Registry tweaks ---------------------------------------------------- & $Log "Loading offline registry hives..." reg load HKLM\zCOMPONENTS "$ScratchDir\Windows\System32\config\COMPONENTS" reg load HKLM\zDEFAULT "$ScratchDir\Windows\System32\config\default" @@ -243,7 +243,7 @@ function Invoke-WinUtilISOScript { & $Log "Pre-staged setup script: $relPath" } } else { - & $Log "Warning: no nodes found in autounattend.xml — setup scripts not pre-staged." + & $Log "Warning: no nodes found in autounattend.xml - setup scripts not pre-staged." } } catch { & $Log "Warning: could not pre-stage setup scripts from autounattend.xml: $_" @@ -255,7 +255,7 @@ function Invoke-WinUtilISOScript { & $Log "Written autounattend.xml to ISO root ($isoDest)." } } else { - & $Log "Warning: autounattend.xml content is empty — skipping OOBE bypass file." + & $Log "Warning: autounattend.xml content is empty - skipping OOBE bypass file." } & $Log "Disabling reserved storage..." @@ -323,7 +323,7 @@ function Invoke-WinUtilISOScript { reg unload HKLM\zSOFTWARE reg unload HKLM\zSYSTEM - # ── 4. Delete scheduled task definition files ───────────────────────────── + # -- 4. Delete scheduled task definition files ----------------------------- & $Log "Deleting scheduled task definition files..." $tasksPath = "$ScratchDir\Windows\System32\Tasks" Remove-Item "$tasksPath\Microsoft\Windows\Application Experience\Microsoft Compatibility Appraiser" -Force @@ -339,7 +339,7 @@ function Invoke-WinUtilISOScript { Remove-Item "$tasksPath\Microsoft\WindowsUpdate" -Recurse -Force & $Log "Scheduled task files deleted." - # ── 5. Remove ISO support folder ───────────────────────────────────────── + # -- 5. Remove ISO support folder ----------------------------------------- if ($ISOContentsDir -and (Test-Path $ISOContentsDir)) { & $Log "Removing ISO support\ folder..." Remove-Item -Path (Join-Path $ISOContentsDir "support") -Recurse -Force diff --git a/functions/private/Reset-WPFCheckBoxes.ps1 b/functions/private/Reset-WPFCheckBoxes.ps1 index 17536eaf..5069d446 100644 --- a/functions/private/Reset-WPFCheckBoxes.ps1 +++ b/functions/private/Reset-WPFCheckBoxes.ps1 @@ -50,7 +50,7 @@ function Reset-WPFCheckBoxes { if($doToggles) { # Restore toggle switch states from imported config. - # Only act on toggles that are explicitly listed in the import — toggles absent + # Only act on toggles that are explicitly listed in the import - toggles absent # from the export file were not part of the saved config and should keep whatever # state the live system already has (set during UI initialisation via Get-WinUtilToggleStatus). $importedToggles = $sync.selectedToggles