fix(sxsc): remove settings ads using files

Atlas-OS · Dec 20, 2023 · a6b4076 · a6b4076
1 parent 2620765
commit a6b4076
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 74 deletions.
diff --git a/.github/workflows/apbx.yaml b/.github/workflows/apbx.yaml
@@ -67,10 +67,10 @@ jobs:
           $packagePath = "$atlasSrcPath\playbook\Executables\AtlasModules\Packages"
           mkdir $packagePath -EA 0 | Out-Null
           Get-ChildItem "configs" -Filter *.yaml | ForEach-Object {
-              Write-Output "`nProcessing $($_.Name)`n------------------------------------------------------"
+              Write-Output "`n`nProcessing $($_.Name)`n------------------------------------------------------"
               Copy-Item -Path $_.FullName -Destination "cfg.yaml" -Force | Out-Null
 
-              $folderDir = ".\$atlasSrcPath\sxsc\$($_.Name)"
+              $folderDir = ".\$atlasSrcPath\sxsc\$($_.Name -replace '-Arm','')"
               if (Test-Path $folderDir -PathType Container) {
                   Write-Output "Copying $($_.Name)'s files..."
                   Copy-Item -Path "$folderDir\*" -Destination '.\' -Recurse -Force | Out-Null

diff --git a/src/playbook/Configuration/atlas/appx.yml b/src/playbook/Configuration/atlas/appx.yml
@@ -62,11 +62,6 @@ actions:
   - !appx: {name: '*Microsoft.XboxGameOverlay*', type: family}
   - !appx: {name: '*Microsoft.XboxGamingOverlay*', type: family}
 
-  - !powerShell:
-    command: '.\CLIENTCBS.ps1'
-    exeDir: true
-    wait: true
-
   # Family App, Quick Assist
   - !appx: {name: '*MicrosoftCorporationII.QuickAssist*', type: family}
   - !appx: {name: '*MicrosoftCorporationII.MicrosoftFamily*', type: family}

diff --git a/src/playbook/Configuration/tweaks/qol/set-hidden-settings-pages.yml b/src/playbook/Configuration/tweaks/qol/set-hidden-settings-pages.yml
@@ -17,6 +17,6 @@ actions:
   - !registryValue:
     path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer'
     value: 'SettingsPageVisibility'
-    data: 'hide:recovery;autoplay;usb;maps;maps-downloadmaps;findmydevice;privacy;privacy-speechtyping;privacy-speech;privacy-feedback;privacy-activityhistory;search-permissions;privacy-location;privacy-general;sync;printers;cortana-windowssearch;mobile-devices;mobile-devices-addphone;family-group;deviceusage;home;account;'
+    data: 'hide:recovery;autoplay;usb;maps;maps-downloadmaps;findmydevice;privacy;privacy-speechtyping;privacy-speech;privacy-feedback;privacy-activityhistory;search-permissions;privacy-location;privacy-general;sync;printers;cortana-windowssearch;mobile-devices;mobile-devices-addphone;family-group;deviceusage;home;'
     type: REG_SZ
     builds: [ '>=22000' ]
diff --git a/src/playbook/Executables/CLIENTCBS.ps1 b/src/playbook/Executables/CLIENTCBS.ps1
diff --git a/src/sxsc/Atlas-Misc-Arm.yaml b/src/sxsc/Atlas-Misc-Arm.yaml
@@ -9,4 +9,8 @@ updates:
     files:
       - file: 'SystemSettingsExtensions.dll' # Remove banner from Settings
         destination: '$(runtime.windows)\SystemApps\MicrosoftWindows.Client.CBS_cw5n1h2txyewy\'
-        operation: delete
+        operation: replace
+      - file: 'SettingsExtensions.json' # Remove ads from 'Accounts' page in Settings
+        destination: '$(runtime.windows)\SystemApps\MicrosoftWindows.Client.CBS_cw5n1h2txyewy\Public\wsxpacks\Account\'
+        operation: replace
+        text: '{}'
diff --git a/src/sxsc/Atlas-Misc.yaml b/src/sxsc/Atlas-Misc.yaml
@@ -9,4 +9,8 @@ updates:
     files:
       - file: 'SystemSettingsExtensions.dll' # Remove banner from Settings
         destination: '$(runtime.windows)\SystemApps\MicrosoftWindows.Client.CBS_cw5n1h2txyewy\'
-        operation: delete
+        operation: replace
+      - file: 'SettingsExtensions.json' # Remove ads from 'Accounts' page in Settings
+        destination: '$(runtime.windows)\SystemApps\MicrosoftWindows.Client.CBS_cw5n1h2txyewy\Public\wsxpacks\Account\'
+        operation: replace
+        text: '{}'