diff --git a/.bin/d7ii/3rd Party Tools/MBAM_Uninstall.cmd b/.bin/d7ii/3rd Party Tools/MBAM_Uninstall.cmd index 15ee7722..b1d0387d 100644 --- a/.bin/d7ii/3rd Party Tools/MBAM_Uninstall.cmd +++ b/.bin/d7ii/3rd Party Tools/MBAM_Uninstall.cmd @@ -7,12 +7,12 @@ pushd "%~dp0" :: Credit to SS64.com Code taken from http://ss64.com/nt/syntax-getdate.html :: Use WMIC to retrieve date and time in ISO 8601 format. for /f "skip=1 tokens=1-6" %%G in ('WMIC Path Win32_LocalTime Get Day^,Hour^,Minute^,Month^,Second^,Year /Format:table') do ( - if "%%~L"=="" goto s_done - set _yyyy=%%L - set _mm=00%%J - set _dd=00%%G - set _hour=00%%H - set _minute=00%%I + if "%%~L"=="" goto s_done + set _yyyy=%%L + set _mm=00%%J + set _dd=00%%G + set _hour=00%%H + set _minute=00%%I ) :s_done :: Pad digits with leading zeros @@ -24,10 +24,11 @@ set iso_date=%_yyyy%-%_mm%-%_dd% rem Get uninstaller path from registry set "uninstaller=" +set "altuninstaller=%PROGRAMFILES%\Malwarebytes\Anti-Malware\mbuns.exe" for /f usebackq^ tokens^=2^ delims^=^" %%s in ( - `reg query "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{35065F43-4BB2-439A-BFF7-0F1014F2E0CD}_is1" /v UninstallString` + `reg query "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{35065F43-4BB2-439A-BFF7-0F1014F2E0CD}_is1" /v UninstallString` ) do ( - set "uninstaller=%%s" + set "uninstaller=%%s" ) rem Copy logs to 1201 folder @@ -36,28 +37,35 @@ robocopy /e "%PROGRAMDATA%\Malwarebytes\MBAMService\LOGS" "%SYSTEMDRIVE%\1201\Lo robocopy /e "%PROGRAMDATA%\Malwarebytes\MBAMService\ScanResults" "%SYSTEMDRIVE%\1201\Logs\%iso_date%\Tools\MBAM" >nul if exist "%SYSTEMDRIVE%\1201\Preserve-MBAM.marker" ( - rem Keep MBAM - echo Previous Malwarebytes installation detected. + rem Keep MBAM + echo Previous Malwarebytes installation detected. ) else ( - rem Move Quarantine to 1201 folder - move "%PROGRAMDATA%\Malwarebytes\Malwarebytes Anti-Malware\Quarantine" "%SYSTEMDRIVE%\1201\Quarantine\MBAM_%iso_date%_%_hour%%_minute%" - - rem Remove MBAM - echo No previous Malwarebytes installation detected. - if exist "%uninstaller%" ( - echo "Uninstalling Malwarebytes..." - start "" /wait "%uninstaller%" /VERYSILENT /NORESTART /LOG - ) else ( - color 4e - echo "Malwarebytes installation not found." - echo "" - echo "Press any key to exit... " - pause >nul - ) + rem Move Quarantine to 1201 folder + move "%PROGRAMDATA%\Malwarebytes\Malwarebytes Anti-Malware\Quarantine" "%SYSTEMDRIVE%\1201\Quarantine\MBAM_%iso_date%_%_hour%%_minute%" + + rem Remove MBAM + echo No previous Malwarebytes installation detected. + if exist "%uninstaller%" ( + echo "Uninstalling Malwarebytes..." + start "" /wait "%uninstaller%" /VERYSILENT /NORESTART /LOG + goto Done + ) + if exist "%altuninstaller%" ( + rem MBAM 4.x workaround + echo "Uninstalling Malwarebytes..." + start "" /wait "%altuninstaller%" /Uninstall /VERYSILENT /NORESTART /LOG + goto Done + ) + color 4e + echo "Malwarebytes installation not found." + echo "" + echo "Press any key to exit... " + pause >nul ) +:Done rem Remove marker -del /f "%SYSTEMDRIVE%\1201\Preserve-MBAM.marker" +del /f "%SYSTEMDRIVE%\1201\Preserve-MBAM.marker" 2>nul popd -endlocal \ No newline at end of file +endlocal