ignore taskkill errors

This commit is contained in:
h3r0 2023-11-22 09:40:09 +00:00 committed by GitHub
parent b89f04abe6
commit d2611d9681
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 16 deletions

View File

@ -8,10 +8,10 @@ actions:
# Microsoft Edge
- !writeStatus: {status: "Removing Microsoft Edge", option: "remove-edge"}
- !taskKill: {name: "MicrosoftEdgeUpdate", option: "remove-edge"}
- !taskKill: {name: "msedge", option: "remove-edge"}
- !taskKill: {name: "MicrosoftEdge*", option: "remove-edge"}
- !taskKill: {name: "setup", pathContains: "\\Edge", option: "remove-edge"}
- !taskKill: {name: "MicrosoftEdgeUpdate", ignoreErrors: true, option: "remove-edge"}
- !taskKill: {name: "msedge", ignoreErrors: true, option: "remove-edge"}
- !taskKill: {name: "MicrosoftEdge*", ignoreErrors: true, option: "remove-edge"}
- !taskKill: {name: "setup", ignoreErrors: true, pathContains: "\\Edge", option: "remove-edge"}
- !run: {exeDir: true, exe: "EDGE.cmd", option: "remove-edge", weight: 40}
- !file: {path: "%ProgramFiles(x86)%\\Microsoft\\Edge", option: "remove-edge", weight: 50}
# - !service: {name: "edgeupdate", operation: delete}
@ -28,9 +28,9 @@ actions:
# 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"}
- !taskKill: {name: "OneDriveStandaloneUpdater", ignoreErrors: true, option: "remove-onedrive"}
- !taskKill: {name: "OneDriveSetup", ignoreErrors: true, option: "remove-onedrive"}
- !taskKill: {name: "OneDrive*", ignoreErrors: true, option: "remove-onedrive"}
- !run: {exeDir: true, exe: "ONED.cmd", option: "remove-onedrive", weight: 40}
# - !service: {name: "OneSyncSvc*", option: "remove-onedrive", operation: delete}

View File

@ -4,14 +4,14 @@ description: Copies Revision folders/files, and configures some initial settings
privilege: TrustedInstaller
actions:
- !taskKill: {name: "explorer"}
- !taskKill: {name: "SearchApp"}
- !taskKill: {name: "SearchHost"}
- !taskKill: {name: "RuntimeBroker"}
- !taskKill: {name: "TextInputHost"}
- !taskKill: {name: "ShellExperienceHost"}
- !taskKill: {name: "backgroundTaskHost"}
- !taskKill: {name: "Widgets"}
- !taskKill: {name: "explorer", ignoreErrors: true}
- !taskKill: {name: "SearchApp", ignoreErrors: true}
- !taskKill: {name: "SearchHost", ignoreErrors: true}
- !taskKill: {name: "RuntimeBroker", ignoreErrors: true}
- !taskKill: {name: "TextInputHost", ignoreErrors: true}
- !taskKill: {name: "ShellExperienceHost", ignoreErrors: true}
- !taskKill: {name: "backgroundTaskHost", ignoreErrors: true}
- !taskKill: {name: "Widgets", ignoreErrors: true}
- !writeStatus: {status: "Initializing"}

View File

@ -12,7 +12,7 @@ for /f "usebackq tokens=2 delims=\" %%e in (`reg query "HKEY_USERS" ^| findstr /
)
)
taskkill /f /im "OneDrive.exe"
taskkill /f /im "OneDrive.exe" >NUL 2>nul
for /f "usebackq delims=" %%a in (`dir /b /a:d "%SystemDrive%\Users"`) do (
rmdir /q /s "%SystemDrive%\Users\%%a\AppData\Local\Microsoft\OneDrive" >NUL 2>nul