update

- Added OneDrive in custom features
meetrevision · Aug 22, 2023 · 4573e90 · 4573e90
1 parent add2111
commit 4573e90
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 22 deletions.
diff --git a/src/Configuration/features/revision/appx.yml b/src/Configuration/features/revision/appx.yml
@@ -12,7 +12,7 @@ actions:
   - !appx: {name: '*microsoft.microsoftedge.stable*', type: family}
   - !appx: {name: '*Microsoft.MicrosoftEdge*', type: family}
   - !appx: {name: '*Microsoft.MicrosoftEdgeDevToolsClient*', type: family}
-  - !appx: {name: '*OneDrive*', type: family}
+  - !appx: {name: '*OneDrive*', type: family, option: "remove-onedrive"}
   - !appx: {name: '*Spotify*', type: family}
   - !appx: {name: '*SecureAssessmentBrowser*', type: family}
   - !appx: {name: '*PeopleExperienceHost*', type: family}

diff --git a/src/Configuration/features/revision/components.yml b/src/Configuration/features/revision/components.yml
@@ -9,38 +9,40 @@ actions:
 
   - !taskKill: {name: "explorer"}
 
-  - !writeStatus: {status: "Removing Windows components"}
+  - !writeStatus: {status: "Removing components"}
 
     # Microsoft Edge
+  - !writeStatus: {status: "Removing Microsoft Edge"}
   - !taskKill: {name: "MicrosoftEdgeUpdate"}
   - !taskKill: {name: "msedge"}
   - !taskKill: {name: "MicrosoftEdge*"}
   - !taskKill: {name: "setup", pathContains: "\\Edge"}
   - !taskKill: {name: "msedgewebview2"}
+  - !file: {path: "%ProgramFiles(x86)%\\Microsoft\\Edge", weight: 10}
   # - !service: {name: "edgeupdate", operation: delete}
   # - !service: {name: "edgeupdatem", operation: delete}
   # - !service: {name: "MicrosoftEdgeElevationService", operation: delete}
   - !run: {exeDir: true, exe: "EDGE.cmd", weight: 20}  
-
-  - !file: {path: "%ProgramFiles(x86)%\\Microsoft\\Edge", weight: 10}
+
   # - !file: {path: "%ProgramFiles(x86)%\\Microsoft\\EdgeUpdate", weight: 10}
   # - !file: {path: "%ProgramFiles(x86)%\\Microsoft\\EdgeCore", weight: 10}
 
     # OneDrive
-  - !taskKill: {name: "OneDriveStandaloneUpdater"}
-  - !taskKill: {name: "OneDriveSetup"}
-  - !taskKill: {name: "OneDrive*"}
+  - !writeStatus: {status: "Removing OneDrive", option: "remove-onedrive"}
+  - !taskKill: {name: "OneDriveStandaloneUpdater", option: "remove-onedrive"}
+  - !taskKill: {name: "OneDriveSetup", option: "remove-onedrive"}
+  - !taskKill: {name: "OneDrive*", option: "remove-onedrive"}
 
-  - !cmd: {command: '%windir%\System32\OneDriveSetup.exe /uninstall'}
-  - !cmd: {command: '%windir%\SysWOW64\OneDriveSetup.exe /uninstall'}
+  - !cmd: {command: '%windir%\System32\OneDriveSetup.exe /uninstall', option: "remove-onedrive"}
+  - !cmd: {command: '%windir%\SysWOW64\OneDriveSetup.exe /uninstall', option: "remove-onedrive"}
 
-  - !file: {path: "%windir%\\System32\\OneDriveSetup.exe"}
-  - !file: {path: "%windir%\\SysWOW64\\OneDriveSetup.exe"}
-  - !file: {path: "%windir%\\SysWOW64\\OneDriveSettingSyncProvider.dll"}
-  - !file: {path: "%SystemDrive%\\OneDriveTemp"}
-  - !file: {path: "%ProgramData%\\Microsoft OneDrive"}
+  - !file: {path: "%windir%\\System32\\OneDriveSetup.exe", option: "remove-onedrive"}
+  - !file: {path: "%windir%\\SysWOW64\\OneDriveSetup.exe", option: "remove-onedrive"}
+  - !file: {path: "%windir%\\SysWOW64\\OneDriveSettingSyncProvider.dll", option: "remove-onedrive"}
+  - !file: {path: "%SystemDrive%\\OneDriveTemp", option: "remove-onedrive"}
+  - !file: {path: "%ProgramData%\\Microsoft OneDrive", option: "remove-onedrive"}
 
-  - !run: {exeDir: true, exe: "ONED.cmd", weight: 20}
+  - !run: {exeDir: true, exe: "ONED.cmd", option: "remove-onedrive", weight: 20}
 
     # Update Health Tools
   - !cmd: {command: 'msiexec /X{43D501A5-E5E3-46EC-8F33-9E15D2A2CBD5} /qn /norestart'}

diff --git a/src/Configuration/features/revision/packages.yml b/src/Configuration/features/revision/packages.yml
@@ -772,11 +772,11 @@ actions:
   # - !systemPackage: {name: 'Microsoft-Windows-GameExplorer', arch: wow64, language: 'neutral'}
   - !systemPackage: {name: 'Microsoft-Windows-Indeo4-Codecs', arch: x86, language: 'neutral'}
   - !systemPackage: {name: 'Microsoft-Windows-Indeo5-Codecs', arch: x86, language: 'neutral'}
-  - !systemPackage: {name: 'Microsoft-Windows-OneDrive-Setup-Deployment-LanguagePack', arch: amd64, language: 'en-US'}
-  - !systemPackage: {name: 'Microsoft-Windows-OneDrive-Setup-Deployment', arch: amd64, language: 'neutral'}
-  - !systemPackage: {name: 'Microsoft-Windows-OneDrive-Setup-WOW64-Deployment-LanguagePack', arch: amd64, language: 'en-US'}
-  - !systemPackage: {name: 'Microsoft-Windows-OneDrive-Setup-WOW64-Deployment', arch: amd64, language: 'neutral'}
-  - !systemPackage: {name: 'Microsoft-Windows-SystemSettings-SettingsHandlers-OneDriveBackup', arch: amd64, language: 'neutral'}
+  - !systemPackage: {name: 'Microsoft-Windows-OneDrive-Setup-Deployment-LanguagePack', arch: amd64, language: 'en-US', option: "remove-onedrive"}
+  - !systemPackage: {name: 'Microsoft-Windows-OneDrive-Setup-Deployment', arch: amd64, language: 'neutral', option: "remove-onedrive"}
+  - !systemPackage: {name: 'Microsoft-Windows-OneDrive-Setup-WOW64-Deployment-LanguagePack', arch: amd64, language: 'en-US', option: "remove-onedrive"}
+  - !systemPackage: {name: 'Microsoft-Windows-OneDrive-Setup-WOW64-Deployment', arch: amd64, language: 'neutral', option: "remove-onedrive"}
+  - !systemPackage: {name: 'Microsoft-Windows-SystemSettings-SettingsHandlers-OneDriveBackup', arch: amd64, language: 'neutral', option: "remove-onedrive"}
   - !systemPackage: {name: 'Microsoft-Windows-PhotoBasic-Feature-WOW64-Deployment-LanguagePack', arch: amd64, language: 'en-US'}
   - !systemPackage: {name: 'Microsoft-Windows-PhotoBasic-Feature-WOW64-Deployment', arch: amd64, language: 'neutral'}
   - !systemPackage: {name: 'Microsoft-Windows-PhotoBasic-PictureTools-WOW64-Deployment-LanguagePack', arch: amd64, language: 'en-US'}

diff --git a/src/Executables/EDGE.cmd b/src/Executables/EDGE.cmd
@@ -20,4 +20,6 @@ set "path=HKCU\Software\Microsoft\Windows\CurrentVersion\Run"
 
 for /f "tokens=1,*" %%A in ('reg query "%path%" /f "Microsoft" ^| findstr /R "%value%"') do (
     reg delete "%path%" /v "%%A" /f
-)
+)
+
+del /q /f "%userprofile%\Desktop\Microsoft Edge.lnk" >NUL 2>nul
diff --git a/src/playbook.conf b/src/playbook.conf
@@ -60,12 +60,16 @@
             </Options>
             <BottomLine Text="Privacy comparasion" Link="https://privacytests.org/" />
         </RadioImagePage>
-        <CheckboxPage Description="Please select which features you would like to include or exclude with this Playbook.">
+        <CheckboxPage Description="Please select which components you would like to include or exclude with this Playbook.">
             <Options>
                 <CheckboxOption IsChecked="true">
                     <Text>Install .NET 3.5 Framework</Text>
                     <Name>dotnet35</Name>
                 </CheckboxOption>
+                <CheckboxOption IsChecked="true">
+                    <Text>Remove OneDrive</Text>
+                    <Name>remove-onedrive</Name>
+                </CheckboxOption>
             </Options>
         </CheckboxPage>
     </FeaturePages>