diff --git a/TASKS.md b/TASKS.md index 69f6e66..ecfed14 100644 --- a/TASKS.md +++ b/TASKS.md @@ -135,3 +135,4 @@ open until it is run on disposable machines with the required account setups. - [x] Color terminal item statuses while preserving plain redirected output and supporting NO_COLOR. - [x] Preserve existing registry keys during MPC-HC apply and document registry-only storage and capture filtering. - [x] Restore SSH firewall state using enum names, preserve retry state on cleanup failure, and show the elevated error without a wrapper stack trace. +- [x] Install MPC-HC through clsid2.mpc-hc and link its config to the package result. diff --git a/docs/desktop-app-configs.md b/docs/desktop-app-configs.md index b729132..bd4435f 100644 --- a/docs/desktop-app-configs.md +++ b/docs/desktop-app-configs.md @@ -1,9 +1,9 @@ # Desktop application configuration The `desktop-apps` profile installs XnView MP, Zoom, Nextcloud Desktop, Notepad++, -HandBrake, GIMP, Krita, LibreOffice, Waterfox, and Shotcut. It also declares safe -configuration surfaces for MPC-HC and Ontime when those applications are -installed separately. Close an application before applying its config so it +HandBrake, GIMP, Krita, LibreOffice, Waterfox, Shotcut, and MPC-HC. Ontime +configuration is also managed when Ontime is installed separately. +Close an application before applying its config so it does not immediately overwrite the result. The checked-in declarations start as safe no-ops or comment-only files. Populate diff --git a/profiles/desktop-apps.json b/profiles/desktop-apps.json index b779cc5..e72b0e4 100644 --- a/profiles/desktop-apps.json +++ b/profiles/desktop-apps.json @@ -4,6 +4,7 @@ "name": "desktop-apps", "description": "Desktop productivity, communication, creative, media, and file synchronization applications.", "packages": [ + { "id": "clsid2.mpc-hc", "source": "winget", "scope": "machine", "update": "latest" }, { "id": "XnSoft.XnViewMP", "source": "winget", "scope": "machine", "update": "latest" }, { "id": "Zoom.Zoom", "source": "winget", "scope": "machine", "update": "latest" }, { "id": "Nextcloud.NextcloudDesktop", "source": "winget", "scope": "machine", "update": "latest" }, @@ -20,7 +21,8 @@ "name": "mpc-hc-settings", "source": "configs/mpc-hc/settings.json", "target": "HKCU:\\Software\\MPC-HC\\MPC-HC", - "mode": "registry" + "mode": "registry", + "requiresPackage": "clsid2.mpc-hc" }, { "name": "ontime-style", diff --git a/tests/Manifest.Tests.ps1 b/tests/Manifest.Tests.ps1 index 29d4df4..0494afe 100644 --- a/tests/Manifest.Tests.ps1 +++ b/tests/Manifest.Tests.ps1 @@ -5,7 +5,7 @@ BeforeAll { Describe 'Manifest resolution' { It 'resolves the checked-in example in profile order' { $result = Resolve-MachineManifest -RepositoryRoot "$PSScriptRoot/.." -Machine 'beffroi-laptop' - $result.packages.Count | Should -Be 13 + $result.packages.Count | Should -Be 14 $result.configs.Count | Should -Be 7 $result.packages[0].id | Should -Be 'Git.Git' $result.packages.id | Should -Contain 'XnSoft.XnViewMP' @@ -18,7 +18,7 @@ Describe 'Manifest resolution' { $result.packages.id | Should -Contain 'TheDocumentFoundation.LibreOffice' $result.packages.id | Should -Contain 'Waterfox.Waterfox' $result.packages.id | Should -Contain 'Meltytech.Shotcut' - $result.packages.id | Should -Not -Contain 'clsid2.mpc-hc' + $result.packages.id | Should -Contain 'clsid2.mpc-hc' $result.packages.id | Should -Not -Contain 'cpvalente.ontime' }