mirror of
https://github.com/ChrisTitusTech/winutil.git
synced 2024-12-21 21:41:29 -06:00
Fix onedrive remove for msapps
This commit is contained in:
parent
39ee4d53c0
commit
d49b21f881
@ -2682,17 +2682,26 @@
|
|||||||
"
|
"
|
||||||
$OneDrivePath = $($env:OneDrive)
|
$OneDrivePath = $($env:OneDrive)
|
||||||
Write-Host \"Removing OneDrive\"
|
Write-Host \"Removing OneDrive\"
|
||||||
|
|
||||||
|
# Check both traditional and Microsoft Store installations
|
||||||
$regPath = \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OneDriveSetup.exe\"
|
$regPath = \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OneDriveSetup.exe\"
|
||||||
|
$msStorePath = \"HKCU:\\Software\\Microsoft\\Windows\\CurrentVersion\\Appx\\AppxAllUserStore\\Applications\\*OneDrive*\"
|
||||||
|
|
||||||
if (Test-Path $regPath) {
|
if (Test-Path $regPath) {
|
||||||
$OneDriveUninstallString = Get-ItemPropertyValue \"$regPath\" -Name \"UninstallString\"
|
$OneDriveUninstallString = Get-ItemPropertyValue \"$regPath\" -Name \"UninstallString\"
|
||||||
$OneDriveExe, $OneDriveArgs = $OneDriveUninstallString.Split(\" \")
|
$OneDriveExe, $OneDriveArgs = $OneDriveUninstallString.Split(\" \")
|
||||||
Start-Process -FilePath $OneDriveExe -ArgumentList \"$OneDriveArgs /silent\" -NoNewWindow -Wait
|
Start-Process -FilePath $OneDriveExe -ArgumentList \"$OneDriveArgs /silent\" -NoNewWindow -Wait
|
||||||
|
} elseif (Test-Path $msStorePath) {
|
||||||
|
Write-Host \"OneDrive appears to be installed via Microsoft Store\" -ForegroundColor Yellow
|
||||||
|
# Attempt to uninstall via winget
|
||||||
|
Start-Process -FilePath winget -ArgumentList \"uninstall -e --purge --accept-source-agreements Microsoft.OneDrive\" -NoNewWindow -Wait
|
||||||
} else {
|
} else {
|
||||||
Write-Host \"Onedrive dosn't seem to be installed anymore\" -ForegroundColor Red
|
Write-Host \"OneDrive doesn't seem to be installed\" -ForegroundColor Red
|
||||||
return
|
Write-Host \"Running cleanup if OneDrive path exists\" -ForegroundColor Red
|
||||||
}
|
}
|
||||||
# Check if OneDrive got Uninstalled
|
|
||||||
if (-not (Test-Path $regPath)) {
|
# Check if OneDrive got Uninstalled (both paths)
|
||||||
|
if (Test-Path $OneDrivePath) {
|
||||||
Write-Host \"Copy downloaded Files from the OneDrive Folder to Root UserProfile\"
|
Write-Host \"Copy downloaded Files from the OneDrive Folder to Root UserProfile\"
|
||||||
Start-Process -FilePath powershell -ArgumentList \"robocopy '$($OneDrivePath)' '$($env:USERPROFILE.TrimEnd())\\' /mov /e /xj\" -NoNewWindow -Wait
|
Start-Process -FilePath powershell -ArgumentList \"robocopy '$($OneDrivePath)' '$($env:USERPROFILE.TrimEnd())\\' /mov /e /xj\" -NoNewWindow -Wait
|
||||||
|
|
||||||
@ -2758,7 +2767,7 @@
|
|||||||
Write-Host \"If there are Files missing afterwards, please Login to Onedrive.com and Download them manually\" -ForegroundColor Yellow
|
Write-Host \"If there are Files missing afterwards, please Login to Onedrive.com and Download them manually\" -ForegroundColor Yellow
|
||||||
Start-Sleep 5
|
Start-Sleep 5
|
||||||
} else {
|
} else {
|
||||||
Write-Host \"Something went Wrong during the Unistallation of OneDrive\" -ForegroundColor Red
|
Write-Host \"Nothing to Cleanup with OneDrive\" -ForegroundColor Red
|
||||||
}
|
}
|
||||||
"
|
"
|
||||||
],
|
],
|
||||||
|
Loading…
Reference in New Issue
Block a user