View difference between Paste ID: ugwLzGXd and EaFke4vh

-:: Purpose:       1. Nuke ALL versions of the Java Runtime, series 3 through 7, x86 and x64, and JavaFX
+:: Purpose:       1. Nuke ALL versions of JavaFX and the Java Runtime, series 3 through 7, x86 and x64
 ::                2. Leaves Java Development Kit installations intact
 ::                3. Reinstalls the latest JRE (if you want it to)
 ::                4. Puts the lotion on its skin.
-:: Requirements:  local administrative rights
+:: Requirements:  local administrative rights; WMI
 :: Author:        vocatus on reddit.com/r/sysadmin and /r/usefulscripts
 ::                additional thanks to:
-::                 - reddit.com/user/MrYiff          : testing which solved bug with OS_VERSION variable
+::                 - reddit.com/user/sdjason         : JRE reinstall functionality; selective process killing; et al
 ::                 - reddit.com/user/MrYiff          : bug fix related to OS_VERSION variable
-::                 - reddit.com/user/sdjason         : optional JRE reinstall functionality
+
 ::                 - forums.oracle.com/people/mattmn : a lot of stuff from his Java removal script
-:: History:       1.4.1 / FIX:          Re-enabled "echo off" statement at beginning of script
+:: History:       1.5.0 + FEATURE:      Added ability to choose whether or not to kill running Java processes before executing,
-::                      / FIX:          Fixed empty OS_VERSION variable on Vista/7/2008/8/2012 (MrYiff)
+::                                      along with a variable to specify an exit code to use                   (sdjason)
 ::                      + FEATURE:      Added ability to selectively reinstall x64 and x86 versions of the JRE (sdjason)
 ::                      * IMPROVEMENT:  Converted JRE 3 uninstaller section to a FOR loop
 ::                      * IMPROVEMENT:  Converted many commands into FOR loops with test cases to check if they should run or not (sdjason)
 ::                      * IMPROVEMENT:  File deletion commands now aren't run if their target doesn't exist.
-::                      + FILE CLEANUP: Added C:\Users*\AppData\LocalLow\Sun\Java\jre* (cannibalkitteh)
+::                                      This should reduce unecessary errors in the console and log.     (sdjason)
-::                      + FILE CLEANUP: Added C:\Users*\AppData\LocalLow\Sun\Java\AU   (cannibalkitteh)
+::                      / FIX:			Fixed incorrect search string in XP version of Java installer cache purge
 ::                1.4.1 / FIX:          Re-enabled "echo off" statement at beginning of script
 ::                      / FIX:          Fixed empty OS_VERSION variable on Vista/7/2008/8/2012           (MrYiff)
-::                      + FILE CLEANUP: Major overhaul,                                (mattm)
+
-::                      + REGISTRY:     Added additional locations:                    (cannibalkitteh)
+
 ::                      + FEATURE:      Added XP versions of a lot of the code
 ::                1.3   + FEATURE:      Added variables to reinstall Java after cleanup (off by default) (sdjason)
 ::                      + FILE CLEANUP: Added C:\Users*\AppData\LocalLow\Sun\Java\jre*                   (cannibalkitteh)
 ::                      + FILE CLEANUP: Added C:\Users*\AppData\LocalLow\Sun\Java\AU                     (cannibalkitteh)
 ::                1.2   + COMMENTS:     Improved a lot of commenting
-::                1.1   + Massive overhaul of functionality and logging
+
 ::                      + FILE CLEANUP: Major overhaul to section                                        (mattm)
 ::                      + REGISTRY:     Added additional locations:                                      (cannibalkitteh)
 ::                        - HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall
 ::                        - HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall
-set VERSION=1.4.1
+
-set UPDATED=2013-07-18
+
 ::                      * LOGGING:      Minor improvements
 ::                1.1   + Overhaul of functionality and logging
-:: VARIABLES :: -- set these if you'd like
+
 
 :: Prep
 @echo off
 set VERSION=1.5.0
 set UPDATED=2013-07-23
 title Java Runtime Nuker v%VERSION% (%UPDATED%)
 
 :::::::::::::::
 :: VARIABLES :: -- set these if you'd like. The defaults should work fine though
 :::::::::::::::
 :: Rules for variables:
 ::  * NO quotes!                       (bad:  "c:\directory\path"       )
-:: Java re-install. Change to 'yes' if you want to reinstall Java after cleanup is done.
+
-:: If you do, make sure to set the location, file name and arguments below!
+
-set REINSTALL_JAVA=no
+
 ::                                     (       \\172.16.1.5\share name  )
-:: The JRE installer must be in a place the script can find it (e.g. the same directory as the script)
+
-set JAVA_LOCATION=%~dp0
+
-set JAVA_BINARY=jre-7u25-windows-x64.exe
+
-set JAVA_ARGUMENTS=/s /v"ADDLOCAL=ALL IEXPLORER=1 MOZILLA=1 JAVAUPDATE=0 REBOOT=suppress" /qn
+
 
-:: =================================================================================== ::
+:: Force-close Java processes? Recommend leaving this set to 'yes' unless you
-::   Think of everything below this line like a feral badger: Look, but Do Not Touch   ::
+:: specifically want to abort the script if the target machine is currently using Java.
-:: =================================================================================== ::
+:: If you change this to 'no', the script will exit with an error code if it finds any running processes.
 set FORCE_CLOSE_PROCESSES=yes
-:: Check if we're on XP, if so, set the flag. This affects some commands later,
+:: Exit code to use when FORCE_CLOSE_PROCESSES is "no" and a running Java process is detected
-:: because XP uses slightly different binaries for reg.exe and various other Windows utilities
+set FORCE_CLOSE_PROCESSES_EXIT_CODE=1618
-ver | find "XP"
+
 :: Java re-install. Do you want to reinstall Java afterwards?
-IF NOT %ERRORLEVEL%==0 set OS_VERSION=OTHER
+:: Change either of these to 'yes' if you want to reinstall Java after cleanup.
 :: If you do, make sure to set the location, file names and arguments below!
-:: Force WMIC location
+set REINSTALL_JAVA_x64=no
 set REINSTALL_JAVA_x86=no
 
 :: The JRE installer must be in a place the script can find it (e.g. network path, same directory, etc)
 :: JRE 64-bit reinstaller
 set JAVA_LOCATION_x64=%~dp0
 set JAVA_BINARY_x86=jre-7u25-windows-x64.exe
 set JAVA_ARGUMENTS_x86=/s /v"ADDLOCAL=ALL IEXPLORER=1 MOZILLA=1 JAVAUPDATE=0 REBOOT=suppress" /qn
 
 :: JRE 32-bit reinstaller
 set JAVA_LOCATION_x86=%~dp0
 set JAVA_BINARY_x86=jre-7u25-windows-x86.exe
 set JAVA_ARGUMENTS_x86=/s /v"ADDLOCAL=ALL IEXPLORER=1 MOZILLA=1 JAVAUPDATE=0 REBOOT=suppress" /qn
 
 
 :: =============================================================================================== ::
 :: ======  Think of everything below this line like a feral badger: Look, but Do Not Touch  ====== ::
 :: =============================================================================================== ::
 
 
-:: Do a quick check to make sure WMI is working, and if not, run a repair on it
+:: Check if we're on XP. This affects some commands later, because XP uses slightly
-wmic timezone
+:: different binaries for reg.exe and various other Windows utilities
 set OS_VERSION=OTHER
-    echo %CUR_DATE% %TIME% ! WMI appears to be broken. Running WMI repair. This might take a minute, be patient...>> "%LOGPATH%\%LOGFILE%"
+ver | find /i "XP" >NUL
-    echo %CUR_DATE% %TIME% ! WMI appears to be broken. Running WMI repair. This might take a minute, be patient...
+
 
 :: Force WMIC location in case the system PATH is messed up
 set WMIC=%WINDIR%\system32\wbem\wmic.exe
 
 :: Create the log directory if it doesn't exist
 if not exist %LOGPATH% mkdir %LOGPATH%
 if exist "%LOGPATH%\%LOGFILE%" del "%LOGPATH%\%LOGFILE%"
 
 :: Get the date into a format we can use (ISO standard date format)
 set CUR_DATE=%DATE:~-4%-%DATE:~4,2%-%DATE:~7,2%
 
 
 :::::::::::::::::::::
 :: PREP AND CHECKS ::
 :::::::::::::::::::::
 echo.
 echo  JAVA RUNTIME NUKER
-
+
-:: Kill all browsers and running Java instances first
+if %OS_VERSION%==XP echo. && echo  ! Windows XP detected, using alternate command set to compensate.
-echo %CUR_DATE% %TIME%   Killing all running browsers and Java instances...>> "%LOGPATH%\%LOGFILE%"
+
-echo %CUR_DATE% %TIME%   Killing all running browsers and Java instances...
+
 echo %CUR_DATE% %TIME%   Beginning removal of Java Runtime Environments (series 3-7, x86 and x64) and JavaFX...
-    :: XP version of the task killer
+
-    echo.
+:: Do a quick check to make sure WMI is working, and if not, repair it
-    tskill /a /v java >> "%LOGPATH%\%LOGFILE%"
+wmic timezone >NUL
-    tskill /a /v javaw >> "%LOGPATH%\%LOGFILE%"
+
-    tskill /a /v javaws >> "%LOGPATH%\%LOGFILE%"
+    echo %CUR_DATE% %TIME% ! WMI appears to be broken. Running WMI repair. This might take a minute, please be patient...>> "%LOGPATH%\%LOGFILE%"
-    tskill /a /v jqs >> "%LOGPATH%\%LOGFILE%"
+    echo %CUR_DATE% %TIME% ! WMI appears to be broken. Running WMI repair. This might take a minute, please be patient...
-    tskill /a /v jusched >> "%LOGPATH%\%LOGFILE%"
+
-    tskill /a /v iexplore >> "%LOGPATH%\%LOGFILE%"
+
-    tskill /a /v iexplorer >> "%LOGPATH%\%LOGFILE%"
+
-    tskill /a /v firefox >> "%LOGPATH%\%LOGFILE%"
+
-    tskill /a /v chrome >> "%LOGPATH%\%LOGFILE%"
+
-    echo.
+
-) ELSE (
+
-    :: All other Windows versions
+
-    echo.
+
-    taskkill /f /im java.exe /T >> "%LOGPATH%\%LOGFILE%"
+
-    taskkill /f /im javaw.exe /T >> "%LOGPATH%\%LOGFILE%"
+
-    taskkill /f /im javaws.exe /T >> "%LOGPATH%\%LOGFILE%"
+
-    taskkill /f /im jqs.exe /T >> "%LOGPATH%\%LOGFILE%"
+
-    taskkill /f /im jusched.exe /T >> "%LOGPATH%\%LOGFILE%"
+
-    taskkill /f /im iexplore.exe /T >> "%LOGPATH%\%LOGFILE%"
+
-    taskkill /f /im iexplorer.exe /T >> "%LOGPATH%\%LOGFILE%"
+
-    taskkill /f /im firefox.exe /T >> "%LOGPATH%\%LOGFILE%"
+)
-    taskkill /f /im chrome.exe /T >> "%LOGPATH%\%LOGFILE%"
+
-    echo.
+
 :::::::::::::::::::::::::::
 :: FORCE-CLOSE PROCESSES :: -- Do we want to kill Java before running? If so, this is where it happens
 :::::::::::::::::::::::::::
-	:::::::::::::::::::::::::
+if %FORCE_CLOSE_PROCESSES%==yes (
 	:: Kill all browsers and running Java instances
-:::::::::::::::::::::::::    removing Java, before resorting to more painstaking methods later
+	echo %CUR_DATE% %TIME%   Looking for and closing all running browsers and Java instances...>> "%LOGPATH%\%LOGFILE%"
 	echo %CUR_DATE% %TIME%   Looking for and closing all running browsers and Java instances...
 	if %OS_VERSION%==XP (
 		:: XP version of the task killer
 		:: this loop contains the processes we should kill
 		echo.
-:: This makes it easy to catch ALL of them through liberal use of WMIC wildcards ("_" is single character, "%" is any number of characters)
+		FOR %%i IN (java,javaw,javaws,jqs,jusched,iexplore,iexplorer,firefox,chrome,palemoon) DO (
-:: Additionally, JRE 6 introduced 64-bit runtimes, so in addition to the two-digit Update revision number (e.g. update 34), we also now
+			echo Searching for %%i.exe...
-:: check for the architecture type, which always equals '32' or '64'. First wildcard is the architecture, second is the revision/update number.
+			tskill /a /v %%i >> "%LOGPATH%\%LOGFILE%" 2>NUL
 		)
 		echo.
 	) else (
 		:: 7/8/2008/2008R2/2012/etc version of the task killer
 		:: this loop contains the processes we should kill
 		echo.
 		FOR %%i IN (java,javaw,javaws,jqs,jusched,iexplore,iexplorer,firefox,chrome,palemoon) DO (
 			echo Searching for %%i.exe...
 			taskkill /f /im %%i.exe /T >> "%LOGPATH%\%LOGFILE%" 2>NUL
 		)
 		echo.
 	)
 )
 
 :: If we DON'T want to force-close Java, then check for possible running Java processes and abort the script if we find any
 if %FORCE_CLOSE_PROCESSES%==no (
 	echo %CUR_DATE% %TIME%   Variable FORCE_CLOSE_PROCESSES is set to '%FORCE_CLOSE_PROCESSES%'. Checking for running processes before execution.>> "%LOGPATH%\%LOGFILE%"
 	echo %CUR_DATE% %TIME%   Variable FORCE_CLOSE_PROCESSES is set to '%FORCE_CLOSE_PROCESSES%'. Checking for running processes before execution.
 
 	:: Don't ask...
 	:: Okay so basically we loop through this list of processes, and for each one we dump the result of the search in the '%%a' variable.
 	:: Then, we check that variable, and if it's not null (e.g. FIND.exe found something) then we abort the script, returning the exit code
 	:: specified at the beginning of the script.
 	:: Normally you'd use ERRORLEVEL for this, but because it is very flaky (it doesn't always get set, even when it should) we instead
-:: JRE 3
+	:: resort to using this method of dumping the results in a variable and checking it later.
 	FOR %%i IN (java,javaw,javaws,jqs,jusched,iexplore,iexplorer,firefox,chrome,palemoon) DO (
 		echo %CUR_DATE% %TIME%   Searching for %%i.exe...
-:: This version is so old we have to resort to a different method of removing it
+		for /f "delims=" %%a in ('tasklist ^| find /i "%%i"') do (
-:: Java 2 Runtime Environment Standard Edition v1.3.1_25-00
+			if not [%%a]==[] (
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_25\Uninst.isu" -a 2>NUL
+				echo %CUR_DATE% %TIME% ! ERROR: Process '%%i' is currently running, aborting.>> "%LOGPATH%\%LOGFILE%"
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_24\Uninst.isu" -a 2>NUL
+				echo %CUR_DATE% %TIME% ! ERROR: Process '%%i' is currently running, aborting.
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_23\Uninst.isu" -a 2>NUL
+				exit /b %FORCE_CLOSE_PROCESSES_EXIT_CODE%
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_22\Uninst.isu" -a 2>NUL
+			)
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_21\Uninst.isu" -a 2>NUL
+		)
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_20\Uninst.isu" -a 2>NUL
+	)
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_19\Uninst.isu" -a 2>NUL
+	:: If we made it this far, we didn't find anything, so we can go ahead
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_18\Uninst.isu" -a 2>NUL
+	echo %CUR_DATE% %TIME%   All clear, no running processes found. Going ahead with removal...>> "%LOGPATH%\%LOGFILE%"
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_17\Uninst.isu" -a 2>NUL
+	echo %CUR_DATE% %TIME%   All clear, no running processes found. Going ahead with removal...
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_16\Uninst.isu" -a 2>NUL
+)
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_15\Uninst.isu" -a 2>NUL
+
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_14\Uninst.isu" -a 2>NUL
+
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_13\Uninst.isu" -a 2>NUL
+:::::::::::::::::::::::::
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_12\Uninst.isu" -a 2>NUL
+
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_11\Uninst.isu" -a 2>NUL
+:::::::::::::::::::::::::    removing Java, and then resort to more painstaking methods later
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_10\Uninst.isu" -a 2>NUL
+
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_09\Uninst.isu" -a 2>NUL
+
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_08\Uninst.isu" -a 2>NUL
+
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_07\Uninst.isu" -a 2>NUL
+
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_06\Uninst.isu" -a 2>NUL
+
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_05\Uninst.isu" -a 2>NUL
+:: This makes it easy to catch ALL of them through liberal use of WMI wildcards ("_" is single character, "%" is any number of characters)
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_04\Uninst.isu" -a 2>NUL
+:: Additionally, JRE 6 introduced 64-bit runtimes, so in addition to the two-digit Update XX revision number, we also check for the architecture
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_03\Uninst.isu" -a 2>NUL
+:: type, which always equals '32' or '64'. The first wildcard is the architecture, the second is the revision/update number.
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_02\Uninst.isu" -a 2>NUL
+
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3.1_01\Uninst.isu" -a 2>NUL
+
-%SystemRoot%\IsUninst.exe -f"%SystemDrive%\Program Files\JavaSoft\JRE\1.3\Uninst.isu" -a 2>NUL
+
 echo %CUR_DATE% %TIME%   JRE 7...
-:: Run wildcard uninstallers
+
-echo %CUR_DATE% %TIME%   Now running WMIC wildcard catchall uninstallation...>> "%LOGPATH%\%LOGFILE%"
+
-echo %CUR_DATE% %TIME%   Now running WMIC wildcard catchall uninstallation...
+
 echo %CUR_DATE% %TIME%   JRE 6...>> "%LOGPATH%\%LOGFILE%"
 echo %CUR_DATE% %TIME%   JRE 6...
 :: 1st line is for updates 23-xx, after 64-bit runtimes were introduced.
 :: 2nd line is for updates 1-22, before Oracle released 64-bit JRE 6 runtimes
 %WMIC% product where "IdentifyingNumber like '{26A24AE4-039D-4CA4-87B4-2F8__160__FF}'" call uninstall /nointeractive>> "%LOGPATH%\%LOGFILE%"
 %WMIC% product where "IdentifyingNumber like '{3248F0A8-6813-11D6-A77B-00B0D0160__0}'" call uninstall /nointeractive>> "%LOGPATH%\%LOGFILE%"
 
 :: JRE 5
 echo %CUR_DATE% %TIME%   JRE 5...>> "%LOGPATH%\%LOGFILE%"
 echo %CUR_DATE% %TIME%   JRE 5...
-if %OS_VERSION%==XP(
+
-    echo %CUR_DATE% %TIME%   Registry cleanup doesn't work on Windows XP, skipping...>> "%LOGPATH%\%LOGFILE%"
+
-    echo %CUR_DATE% %TIME%   Registry cleanup doesn't work on Windows XP, skipping...
+
 echo %CUR_DATE% %TIME%   JRE 4...>> "%LOGPATH%\%LOGFILE%"
-    :: All other versions of Windows
+
-    echo %CUR_DATE% %TIME%   Commencing registry cleanup...>> "%LOGPATH%\%LOGFILE%"
+
-    echo %CUR_DATE% %TIME%   Commencing registry cleanup...
+
-    echo %CUR_DATE% %TIME%   Searching for residual registry keys...>> "%LOGPATH%\%LOGFILE%"
+:: JRE 3 (AKA "Java 2 Runtime Environment Standard Edition" v1.3.1_00-25)
-    echo %CUR_DATE% %TIME%   Searching for residual registry keys...
+
 echo %CUR_DATE% %TIME%   JRE 3 (AKA Java 2 Runtime v1.3.xx)...
-    :: Search MSIExec installer class hive for keys
+:: This version is so old we have to resort to different methods of removing it
-    echo %CUR_DATE% %TIME%   Looking in HKLM\software\classes\installer\products...>> "%LOGPATH%\%LOGFILE%"
+:: Loop through each sub-version
-    echo %CUR_DATE% %TIME%   Looking in HKLM\software\classes\installer\products...
+FOR %%i IN (01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25) DO (
-    reg query HKLM\software\classes\installer\products /f "J2SE Runtime" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
+	%SystemRoot%\IsUninst.exe -f"%ProgramFiles%\JavaSoft\JRE\1.3.1_%%i\Uninst.isu" -a 2>NUL
-    reg query HKLM\software\classes\installer\products /f "Java(TM) 6 Update" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
+	%SystemRoot%\IsUninst.exe -f"%ProgramFiles(x86)%\JavaSoft\JRE\1.3.1_%%i\Uninst.isu" -a 2>NUL
-    reg query HKLM\software\classes\installer\products /f "Java 7" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
+)
-    reg query HKLM\software\classes\installer\products /f "Java*Runtime" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
+:: This one wouldn't fit in the loop above
 %SystemRoot%\IsUninst.exe -f"%ProgramFiles%\JavaSoft\JRE\1.3\Uninst.isu" -a 2>NUL
-    :: Search the Add/Remove programs list (this helps with broken Java installations)
+%SystemRoot%\IsUninst.exe -f"%ProgramFiles(x86)%\JavaSoft\JRE\1.3\Uninst.isu" -a 2>NUL
-    echo %CUR_DATE% %TIME%   Looking in HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall...>> "%LOGPATH%\%LOGFILE%"
+
-    echo %CUR_DATE% %TIME%   Looking in HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall...
+:: Wildcard uninstallers
-    reg query HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall /f "J2SE Runtime" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
+echo %CUR_DATE% %TIME%   Specific targeting done. Now running WMIC wildcard catchall uninstallation...>> "%LOGPATH%\%LOGFILE%"
-    reg query HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall /f "Java(TM) 6 Update" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
+echo %CUR_DATE% %TIME%   Specific targeting done. Now running WMIC wildcard catchall uninstallation...
-    reg query HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall /f "Java 7" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
+
-    reg query HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall /f "Java*Runtime" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
+
 %WMIC% product where "name like 'JavaFX%%'" call uninstall /nointeractive>> "%LOGPATH%\%LOGFILE%"
-    :: Search the Add/Remove programs list, x86/Wow64 node (this helps with broken Java installations)
+
-    echo %CUR_DATE% %TIME%   Looking in HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall...>> "%LOGPATH%\%LOGFILE%"
+
-    echo %CUR_DATE% %TIME%   Looking in HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall...
+
-    reg query HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall /f "J2SE Runtime" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
+
-    reg query HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall /f "Java(TM) 6 Update" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
+
-    reg query HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall /f "Java 7" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
+
-    reg query HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall /f "Java*Runtime" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
+
 :: If we're on XP we skip this entire block due to differences in the reg.exe binary
 if '%OS_VERSION%'=='XP' (
-    :: List the leftover registry keys
+    echo %CUR_DATE% %TIME% ! Registry cleanup doesn't work on Windows XP. Skipping...>> "%LOGPATH%\%LOGFILE%"
-    echo %CUR_DATE% %TIME%   Found these keys...>> "%LOGPATH%\%LOGFILE%"
+    echo %CUR_DATE% %TIME% ! Registry cleanup doesn't work on Windows XP. Skipping...
-    echo %CUR_DATE% %TIME%   Found these keys...
+	goto file_cleanup
-    echo.>> "%LOGPATH%\%LOGFILE%"
+	)
-    echo.
+
-    type %TEMP%\java_purge_registry_keys.txt>> "%LOGPATH%\%LOGFILE%"
+echo %CUR_DATE% %TIME%   Commencing registry cleanup...>> "%LOGPATH%\%LOGFILE%"
-    type %TEMP%\java_purge_registry_keys.txt
+echo %CUR_DATE% %TIME%   Commencing registry cleanup...
-    echo.>> "%LOGPATH%\%LOGFILE%"
+echo %CUR_DATE% %TIME%   Searching for residual registry keys...>> "%LOGPATH%\%LOGFILE%"
-    echo.
+echo %CUR_DATE% %TIME%   Searching for residual registry keys...
 
-    :: Backup the various registry keys that will get deleted (if they exist)
+:: Search MSIExec installer class hive for keys
-    :: We do this mainly because we're using wildcards, so we want a method to roll back if we accidentally nuke the wrong thing
+echo %CUR_DATE% %TIME%   Looking in HKLM\software\classes\installer\products...>> "%LOGPATH%\%LOGFILE%"
-    echo %CUR_DATE% %TIME%   Backing up keys...>> "%LOGPATH%\%LOGFILE%"
+echo %CUR_DATE% %TIME%   Looking in HKLM\software\classes\installer\products...
-    echo %CUR_DATE% %TIME%   Backing up keys...
+reg query HKLM\software\classes\installer\products /f "J2SE Runtime" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
-    if exist "%TEMP%\java_purge_registry_backup" rmdir /s /q "%TEMP%\java_purge_registry_backup" >NUL
+reg query HKLM\software\classes\installer\products /f "Java(TM) 6 Update" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
-    mkdir %TEMP%\java_purge_registry_backup >NUL
+reg query HKLM\software\classes\installer\products /f "Java 7" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
-    :: This line walks through the file we generated and dumps each key to a file
+reg query HKLM\software\classes\installer\products /f "Java*Runtime" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
-    for /f "tokens=* delims= " %%a in (%TEMP%\java_purge_registry_keys.txt) do (reg query %%a) >> %TEMP%\java_purge_registry_backup\java_reg_keys_1.bak
+
 :: Search the Add/Remove programs list (this helps with broken Java installations)
-    echo.
+echo %CUR_DATE% %TIME%   Looking in HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall...>> "%LOGPATH%\%LOGFILE%"
-    echo %CUR_DATE% %TIME%   Keys backed up to %TEMP%\java_purge_registry_backup\ >> "%LOGPATH%\%LOGFILE%"
+echo %CUR_DATE% %TIME%   Looking in HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall...
-    echo %CUR_DATE% %TIME%   Keys backed up to %TEMP%\java_purge_registry_backup\
+reg query HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall /f "J2SE Runtime" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
-    echo %CUR_DATE% %TIME%   This directory will be deleted at next reboot, so get it now if you need it! >> "%LOGPATH%\%LOGFILE%"
+reg query HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall /f "Java(TM) 6 Update" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
-    echo %CUR_DATE% %TIME%   This directory will be deleted at next reboot, so get it now if you need it!
+reg query HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall /f "Java 7" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
 reg query HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall /f "Java*Runtime" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
-    :: Purge the keys
+
-    echo %CUR_DATE% %TIME%   Purging keys...>> "%LOGPATH%\%LOGFILE%"
+:: Search the Add/Remove programs list, x86/Wow64 node (this helps with broken Java installations)
-    echo %CUR_DATE% %TIME%   Purging keys...
+echo %CUR_DATE% %TIME%   Looking in HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall...>> "%LOGPATH%\%LOGFILE%"
-    echo.
+echo %CUR_DATE% %TIME%   Looking in HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall...
-    :: This line walks through the file we generated and deletes each key listed
+reg query HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall /f "J2SE Runtime" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
-    for /f "tokens=* delims= " %%a in (%TEMP%\java_purge_registry_keys.txt) do reg delete %%a /va /f>> "%LOGPATH%\%LOGFILE%"
+reg query HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall /f "Java(TM) 6 Update" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
 reg query HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall /f "Java 7" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
-    :: These lines delete some specific Java locations
+reg query HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall /f "Java*Runtime" /s | find "HKEY_LOCAL_MACHINE" >> %TEMP%\java_purge_registry_keys.txt
-    :: These keys AREN'T backed up because here we are specifically targeting known Java keys, whereas
+
-    :: above we were nuking keys based on wildcards, so those need backups in case we nuke something we didn't want to.
+:: List the leftover registry keys
 echo %CUR_DATE% %TIME%   Found these keys...>> "%LOGPATH%\%LOGFILE%"
-    :: Delete keys for 32-bit Java installations on a 64-bit copy of Windows
+echo %CUR_DATE% %TIME%   Found these keys...
-    reg delete "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Auto Update" /va /f>> "%LOGPATH%\%LOGFILE%"
+echo.>> "%LOGPATH%\%LOGFILE%"
-    reg delete "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Plug-in" /va /f>> "%LOGPATH%\%LOGFILE%"
+
-    reg delete "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Runtime Environment" /va /f>> "%LOGPATH%\%LOGFILE%"
+type %TEMP%\java_purge_registry_keys.txt>> "%LOGPATH%\%LOGFILE%"
-    reg delete "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Update" /va /f>> "%LOGPATH%\%LOGFILE%"
+type %TEMP%\java_purge_registry_keys.txt
-    reg delete "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Web Start" /va /f>> "%LOGPATH%\%LOGFILE%"
+echo.>> "%LOGPATH%\%LOGFILE%"
-    reg delete "HKLM\SOFTWARE\Wow6432Node\JreMetrics" /va /f>> "%LOGPATH%\%LOGFILE%"
+
 
-    :: Delete keys for for 32-bit and 64-bit Java installations on matching Windows architecture
+:: Backup the various registry keys that will get deleted (if they exist)
-    reg delete "HKLM\SOFTWARE\JavaSoft\Auto Update" /va /f>> "%LOGPATH%\%LOGFILE%"
+:: We do this mainly because we're using wildcards, so we want a method to roll back if we accidentally nuke the wrong thing
-    reg delete "HKLM\SOFTWARE\JavaSoft\Java Plug-in" /va /f>> "%LOGPATH%\%LOGFILE%"
+echo %CUR_DATE% %TIME%   Backing up keys...>> "%LOGPATH%\%LOGFILE%"
-    reg delete "HKLM\SOFTWARE\JavaSoft\Java Runtime Environment" /va /f>> "%LOGPATH%\%LOGFILE%"
+echo %CUR_DATE% %TIME%   Backing up keys...
-    reg delete "HKLM\SOFTWARE\JavaSoft\Java Update" /va /f>> "%LOGPATH%\%LOGFILE%"
+if exist "%TEMP%\java_purge_registry_backup" rmdir /s /q "%TEMP%\java_purge_registry_backup" 2>NUL
-    reg delete "HKLM\SOFTWARE\JavaSoft\Java Web Start" /va /f>> "%LOGPATH%\%LOGFILE%"
+mkdir %TEMP%\java_purge_registry_backup >NUL
-    reg delete "HKLM\SOFTWARE\JreMetrics" /va /f>> "%LOGPATH%\%LOGFILE%"
+:: This line walks through the file we generated and dumps each key to a file
 for /f "tokens=* delims= " %%a in (%TEMP%\java_purge_registry_keys.txt) do (reg query %%a) >> %TEMP%\java_purge_registry_backup\java_reg_keys_1.bak
-    echo.
+
-    echo %CUR_DATE% %TIME%   Keys purged.>> "%LOGPATH%\%LOGFILE%"
+
-    echo %CUR_DATE% %TIME%   Keys purged.
+echo %CUR_DATE% %TIME%   Keys backed up to %TEMP%\java_purge_registry_backup\ >> "%LOGPATH%\%LOGFILE%"
-    echo %CUR_DATE% %TIME%   Registry cleanup done.>> "%LOGPATH%\%LOGFILE%"
+echo %CUR_DATE% %TIME%   Keys backed up to %TEMP%\java_purge_registry_backup\
-    echo %CUR_DATE% %TIME%   Registry cleanup done.
+echo %CUR_DATE% %TIME%   This directory will be deleted at next reboot, so get it now if you need it! >> "%LOGPATH%\%LOGFILE%"
-    echo.
+echo %CUR_DATE% %TIME%   This directory will be deleted at next reboot, so get it now if you need it!
 
 :: Purge the keys
 echo %CUR_DATE% %TIME%   Purging keys...>> "%LOGPATH%\%LOGFILE%"
 echo %CUR_DATE% %TIME%   Purging keys...
 echo.
 :: This line walks through the file we generated and deletes each key listed
 for /f "tokens=* delims= " %%a in (%TEMP%\java_purge_registry_keys.txt) do reg delete %%a /va /f >> "%LOGPATH%\%LOGFILE%" 2>NUL
 
 :: These lines delete some specific Java locations
 :: These keys AREN'T backed up because these are specific, known Java keys, whereas above we were nuking
 :: keys based on wildcards, so those need backups in case we nuke something we didn't want to.
 
-del /F /Q %WINDIR%\tasks\Java*.job>> "%LOGPATH%\%LOGFILE%"
+:: Delete keys for 32-bit Java installations on a 64-bit copy of Windows
-del /F /Q %WINDIR%\System32\tasks\Java*.job>> "%LOGPATH%\%LOGFILE%"
+reg delete "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Auto Update" /va /f>> "%LOGPATH%\%LOGFILE%" 2>NUL
-del /F /Q %WINDIR%\SysWOW64\tasks\Java*.job>> "%LOGPATH%\%LOGFILE%"
+reg delete "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Plug-in" /va /f>> "%LOGPATH%\%LOGFILE%" 2>NUL
 reg delete "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Runtime Environment" /va /f>> "%LOGPATH%\%LOGFILE%" 2>NUL
 reg delete "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Update" /va /f>> "%LOGPATH%\%LOGFILE%" 2>NUL
-:: Kill the accursed Java Quickstarter and Updater
+reg delete "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Web Start" /va /f>> "%LOGPATH%\%LOGFILE%" 2>NUL
-echo %CUR_DATE% %TIME%   De-registering and removing Java Quickstarter and Updater...>> "%LOGPATH%\%LOGFILE%"
+reg delete "HKLM\SOFTWARE\Wow6432Node\JreMetrics" /va /f>> "%LOGPATH%\%LOGFILE%" 2>NUL
-echo %CUR_DATE% %TIME%   De-registering and removing Java Quickstarter and Updater...
+
-net stop JavaQuickStarterService>> "%LOGPATH%\%LOGFILE%"
+:: Delete keys for for 32-bit and 64-bit Java installations on matching Windows architecture
-sc delete JavaQuickStarterService>> "%LOGPATH%\%LOGFILE%"
+reg delete "HKLM\SOFTWARE\JavaSoft\Auto Update" /va /f>> "%LOGPATH%\%LOGFILE%" 2>NUL
-net stop jusched>> "%LOGPATH%\%LOGFILE%"
+reg delete "HKLM\SOFTWARE\JavaSoft\Java Plug-in" /va /f>> "%LOGPATH%\%LOGFILE%" 2>NUL
-sc delete jusched>> "%LOGPATH%\%LOGFILE%"
+reg delete "HKLM\SOFTWARE\JavaSoft\Java Runtime Environment" /va /f>> "%LOGPATH%\%LOGFILE%" 2>NUL
-"%ProgramFiles(x86)%\Java\jre6\bin\jqs.exe" -disable>> "%LOGPATH%\%LOGFILE%"
+reg delete "HKLM\SOFTWARE\JavaSoft\Java Update" /va /f>> "%LOGPATH%\%LOGFILE%" 2>NUL
-"%ProgramFiles(x86)%\Java\jre7\bin\jqs.exe" -disable>> "%LOGPATH%\%LOGFILE%"
+reg delete "HKLM\SOFTWARE\JavaSoft\Java Web Start" /va /f>> "%LOGPATH%\%LOGFILE%" 2>NUL
-"%ProgramFiles%\Java\jre6\bin\jqs.exe" -disable>> "%LOGPATH%\%LOGFILE%"
+reg delete "HKLM\SOFTWARE\JreMetrics" /va /f>> "%LOGPATH%\%LOGFILE%" 2>NUL
-"%ProgramFiles%\Java\jre7\bin\jqs.exe" -disable>> "%LOGPATH%\%LOGFILE%"
+
-"%ProgramFiles(x86)%\Java\jre6\bin\jqs.exe" -unregister>> "%LOGPATH%\%LOGFILE%"
+
-"%ProgramFiles(x86)%\Java\jre7\bin\jqs.exe" -unregister>> "%LOGPATH%\%LOGFILE%"
+echo %CUR_DATE% %TIME%   Keys purged.>> "%LOGPATH%\%LOGFILE%"
-"%ProgramFiles%\Java\jre6\bin\jqs.exe" -unregister>> "%LOGPATH%\%LOGFILE%"
+echo %CUR_DATE% %TIME%   Keys purged.
-"%ProgramFiles%\Java\jre7\bin\jqs.exe" -unregister>> "%LOGPATH%\%LOGFILE%"
+echo %CUR_DATE% %TIME%   Registry cleanup done.>> "%LOGPATH%\%LOGFILE%"
 echo %CUR_DATE% %TIME%   Registry cleanup done.
 echo.
 
 
-echo %CUR_DATE% %TIME%   Removing "%ProgramFiles(x86)%\Java\jre*" directories...>> "%LOGPATH%\%LOGFILE%"
+
-echo %CUR_DATE% %TIME%   Removing "%ProgramFiles(x86)%\Java\jre*" directories...
+
-for /D /R "%ProgramFiles(x86)%\Java\" %%X in (j2re*) DO RMDIR /S /Q "%%X">> "%LOGPATH%\%LOGFILE%"
+
-for /D /R "%ProgramFiles(x86)%\Java\" %%X in (jre*) DO RMDIR /S /Q "%%X">> "%LOGPATH%\%LOGFILE%"
+:file_cleanup
-rmdir /S /Q "%ProgramFiles(x86)%\JavaSoft\JRE">> "%LOGPATH%\%LOGFILE%"
+
 echo %CUR_DATE% %TIME%   Commencing file and directory cleanup...
 
 :: Kill accursed Java tasks in Task Scheduler
 echo %CUR_DATE% %TIME%   Removing Java tasks from the Windows Task Scheduler...>> "%LOGPATH%\%LOGFILE%"
-for /D /R "%ProgramFiles%\Java\" %%X in (j2re*) DO RMDIR /S /Q "%%X">> "%LOGPATH%\%LOGFILE%"
+
-for /D /R "%ProgramFiles%\Java\" %%X in (jre*) DO RMDIR /S /Q "%%X">> "%LOGPATH%\%LOGFILE%"
+if exist %WINDIR%\tasks\Java*.job del /F /Q %WINDIR%\tasks\Java*.job >> "%LOGPATH%\%LOGFILE%"
-rmdir /S /Q "%ProgramFiles%\JavaSoft\JRE">> "%LOGPATH%\%LOGFILE%"
+if exist %WINDIR%\System32\tasks\Java*.job del /F /Q %WINDIR%\System32\tasks\Java*.job >> "%LOGPATH%\%LOGFILE%"
 if exist %WINDIR%\SysWOW64\tasks\Java*.job del /F /Q %WINDIR%\SysWOW64\tasks\Java*.job >> "%LOGPATH%\%LOGFILE%"
-:: Nuke Java installer cache ( thanks to reddit.com/user/cannibalkitteh )
+
 
 :: Kill the accursed Java Quickstarter service
-ver | find "XP"
+sc query JavaQuickStarterService >NUL
-IF %ERRORLEVEL%==0 (
+if not %ERRORLEVEL%==1060 (
-    ::::::::::::::::
+	echo %CUR_DATE% %TIME%   De-registering and removing Java Quickstarter service...>> "%LOGPATH%\%LOGFILE%"
-    :: XP version ::
+	echo %CUR_DATE% %TIME%   De-registering and removing Java Quickstarter service...
-    ::::::::::::::::
+	net stop JavaQuickStarterService >> "%LOGPATH%\%LOGFILE%" 2>NUL
 	sc delete JavaQuickStarterService >> "%LOGPATH%\%LOGFILE%" 2>NUL
 )
-    for /f "tokens=* delims= " %%a in (%TEMP%\userlist.txt) DO RMDIR /S /Q "%SystemDrive%\Users\%%a\AppData\LocalLow\Sun\Java\AU">> "%LOGPATH%\%LOGFILE%"
+
-    for /D /R "%SystemDrive%\Documents and Settings\" %%X in (jre*) DO RMDIR /S /Q "%%X">> "%LOGPATH%\%LOGFILE%"
+:: Kill the accursed Java Update Scheduler service
-) ELSE (
+sc query jusched >NUL
-    ::::::::::::::::::::::::::
+if not %ERRORLEVEL%==1060 (
-    :: Vista and up version ::
+	echo %CUR_DATE% %TIME%   De-registering and removing Java Update Scheduler service...>> "%LOGPATH%\%LOGFILE%"
-    ::::::::::::::::::::::::::
+	echo %CUR_DATE% %TIME%   De-registering and removing Java Update Scheduler service...
 	net stop jusched >> "%LOGPATH%\%LOGFILE%" 2>NUL
 	sc delete jusched >> "%LOGPATH%\%LOGFILE%" 2>NUL
-    for /f "tokens=* delims= " %%a in (%TEMP%\userlist.txt) DO RMDIR /S /Q "%SystemDrive%\Users\%%a\AppData\LocalLow\Sun\Java\AU">> "%LOGPATH%\%LOGFILE%"
+)
 
-    for /D /R "%SystemDrive%\Users" %%X in (jre*) DO RMDIR /S /Q "%%X">> "%LOGPATH%\%LOGFILE%"
+:: This is the Oracle method of disabling the Java services. 99% of the time these commands aren't required.
 if exist "%ProgramFiles(x86)%\Java\jre6\bin\jqs.exe" "%ProgramFiles(x86)%\Java\jre6\bin\jqs.exe" -disable>> "%LOGPATH%\%LOGFILE%"
 if exist "%ProgramFiles(x86)%\Java\jre7\bin\jqs.exe" "%ProgramFiles(x86)%\Java\jre7\bin\jqs.exe" -disable>> "%LOGPATH%\%LOGFILE%"
 if exist "%ProgramFiles%\Java\jre6\bin\jqs.exe" "%ProgramFiles%\Java\jre6\bin\jqs.exe" -disable>> "%LOGPATH%\%LOGFILE%"
 if exist "%ProgramFiles%\Java\jre7\bin\jqs.exe" "%ProgramFiles%\Java\jre7\bin\jqs.exe" -disable>> "%LOGPATH%\%LOGFILE%"
 if exist "%ProgramFiles(x86)%\Java\jre6\bin\jqs.exe" "%ProgramFiles(x86)%\Java\jre6\bin\jqs.exe" -unregister>> "%LOGPATH%\%LOGFILE%"
 if exist "%ProgramFiles(x86)%\Java\jre7\bin\jqs.exe" "%ProgramFiles(x86)%\Java\jre7\bin\jqs.exe" -unregister>> "%LOGPATH%\%LOGFILE%"
-del /F /Q %SystemDrive%\1033.mst>> "%LOGPATH%\%LOGFILE%"
+if exist "%ProgramFiles%\Java\jre6\bin\jqs.exe" "%ProgramFiles%\Java\jre6\bin\jqs.exe" -unregister>> "%LOGPATH%\%LOGFILE%"
-del /F /S /Q "%SystemDrive%\J2SE Runtime Environment*">> "%LOGPATH%\%LOGFILE%"
+if exist "%ProgramFiles%\Java\jre7\bin\jqs.exe" "%ProgramFiles%\Java\jre7\bin\jqs.exe" -unregister>> "%LOGPATH%\%LOGFILE%"
 msiexec.exe /x {4A03706F-666A-4037-7777-5F2748764D10} /qn /norestart
 
 :: Nuke 32-bit Java installation directories
 if exist "%ProgramFiles(x86)%" (
 	echo %CUR_DATE% %TIME%   Removing "%ProgramFiles(x86)%\Java\jre*" directories...>> "%LOGPATH%\%LOGFILE%"
 	echo %CUR_DATE% %TIME%   Removing "%ProgramFiles(x86)%\Java\jre*" directories...
 	for /D /R "%ProgramFiles(x86)%\Java\" %%x in (j2re*) do if exist "%%x" rmdir /S /Q "%%x">> "%LOGPATH%\%LOGFILE%"
-:: Check if we wanted to install a new version of the JRE. If we didn't, then go ahead and exit.
+	for /D /R "%ProgramFiles(x86)%\Java\" %%x in (jre*) do if exist "%%x" rmdir /S /Q "%%x">> "%LOGPATH%\%LOGFILE%"
-IF %REINSTALL_JAVA%==yes (
+	if exist "%ProgramFiles(x86)%\JavaSoft\JRE" rmdir /S /Q "%ProgramFiles(x86)%\JavaSoft\JRE" >> "%LOGPATH%\%LOGFILE%"
-    echo %CUR_DATE% %TIME% ! Variable "REINSTALL_JAVA" was set to 'yes'. Now installing %JAVA_BINARY%...>> "%LOGPATH%\%LOGFILE%"
+)
-    echo %CUR_DATE% %TIME% ! Variable "REINSTALL_JAVA" was set to 'yes'. Now installing %JAVA_BINARY%...
+
-    "%JAVA_LOCATION%\%JAVA_BINARY%" %JAVA_ARGUMENTS%
+
 echo %CUR_DATE% %TIME%   Removing "%ProgramFiles%\Java\jre*" directories...>> "%LOGPATH%\%LOGFILE%"
 echo %CUR_DATE% %TIME%   Removing "%ProgramFiles%\Java\jre*" directories...
 for /D /R "%ProgramFiles%\Java\" %%x in (j2re*) do if exist "%%x" rmdir /S /Q "%%x">> "%LOGPATH%\%LOGFILE%"
 for /D /R "%ProgramFiles%\Java\" %%x in (jre*) do if exist "%%x" rmdir /S /Q "%%x">> "%LOGPATH%\%LOGFILE%"
 if exist "%ProgramFiles%\JavaSoft\JRE" rmdir /S /Q "%ProgramFiles%\JavaSoft\JRE" >> "%LOGPATH%\%LOGFILE%"
 
 :: Nuke Java installer cache ( thanks to cannibalkitteh )
 echo %CUR_DATE% %TIME%   Purging Java installer cache...>> "%LOGPATH%\%LOGFILE%"
 echo %CUR_DATE% %TIME%   Purging Java installer cache...
 :: XP VERSION
 if %OS_VERSION%==XP (
     :: Get list of users, put it in a file, then use it to iterate through each users profile, deleting the AU folder
     dir "%SystemDrive%\Documents and Settings\" /B > %TEMP%\userlist.txt
     for /f "tokens=* delims= " %%a in (%TEMP%\userlist.txt) do (
 		if exist "%SystemDrive%\Documents and Settings\%%a\AppData\LocalLow\Sun\Java\AU" rmdir /S /Q "%SystemDrive%\Documents and Settings\%%a\AppData\LocalLow\Sun\Java\AU" 2>NUL
 	)
     for /D /R "%SystemDrive%\Documents and Settings\" %%x in (jre*) do if exist "%%x" rmdir /S /Q "%%x" 2>NUL
 ) else (
 	:: ALL OTHER VERSIONS OF WINDOWS
     :: Get list of users, put it in a file, then use it to iterate through each users profile, deleting the AU folder
     dir %SystemDrive%\Users /B > %TEMP%\userlist.txt
     for /f "tokens=* delims= " %%a in (%TEMP%\userlist.txt) do rmdir /S /Q "%SystemDrive%\Users\%%a\AppData\LocalLow\Sun\Java\AU" 2>NUL
     :: Get the other JRE directories
     for /D /R "%SystemDrive%\Users" %%x in (jre*) do rmdir /S /Q "%%x" 2>NUL
     )
 
 :: Miscellaneous stuff, sometimes left over by the installers
 echo %CUR_DATE% %TIME%   Searching for and purging other Java Runtime-related directories...>> "%LOGPATH%\%LOGFILE%"
 echo %CUR_DATE% %TIME%   Searching for and purging other Java Runtime-related directories...
 del /F /Q %SystemDrive%\1033.mst >> "%LOGPATH%\%LOGFILE%" 2>NUL
 del /F /S /Q "%SystemDrive%\J2SE Runtime Environment*" >> "%LOGPATH%\%LOGFILE%" 2>NUL
 echo.
 
 echo %CUR_DATE% %TIME%   File and directory cleanup done.>> "%LOGPATH%\%LOGFILE%"
 echo %CUR_DATE% %TIME%   File and directory cleanup done.
 echo. >> "%LOGPATH%\%LOGFILE%"
 echo.
 
 :: Java Re-installation (x64): Check if we wanted to reinstall the JRE.
 if %REINSTALL_JAVA_x64%==yes (
     echo %CUR_DATE% %TIME% ! Variable "REINSTALL_JAVA_x64" was set to 'yes'. Now installing %JAVA_BINARY_x64%...>> "%LOGPATH%\%LOGFILE%"
     echo %CUR_DATE% %TIME% ! Variable "REINSTALL_JAVA_x64" was set to 'yes'. Now installing %JAVA_BINARY_x64%...
     "%JAVA_LOCATION_x64%\%JAVA_BINARY_x64%" %JAVA_ARGUMENTS_x64%
     java -version
     echo Done.>> "%LOGPATH%\%LOGFILE%"
     )
 
 :: Java Re-installation (x86): Check if we wanted to reinstall the JRE.
 if %REINSTALL_JAVA_x86%==yes (
     echo %CUR_DATE% %TIME% ! Variable "REINSTALL_JAVA_x86" was set to 'yes'. Now installing %JAVA_BINARY_x86%...>> "%LOGPATH%\%LOGFILE%"
     echo %CUR_DATE% %TIME% ! Variable "REINSTALL_JAVA_x86" was set to 'yes'. Now installing %JAVA_BINARY_x86%...
     "%JAVA_LOCATION_x86%\%JAVA_BINARY_x86%" %JAVA_ARGUMENTS_x86%
     java -version
     echo Done.>> "%LOGPATH%\%LOGFILE%"
     )
 
 :: Done.
 echo %CUR_DATE% %TIME%   Registry hive backups: %TEMP%\java_purge_registry_backup\>> "%LOGPATH%\%LOGFILE%"
 echo %CUR_DATE% %TIME%   Registry hive backups: %TEMP%\java_purge_registry_backup\
 echo %CUR_DATE% %TIME%   Log file: "%LOGPATH%\%LOGFILE%">> "%LOGPATH%\%LOGFILE%"
 echo %CUR_DATE% %TIME%   Log file: "%LOGPATH%\%LOGFILE%"
 echo %CUR_DATE% %TIME%   JAVA NUKER COMPLETE. Recommend rebooting and washing your hands.>> "%LOGPATH%\%LOGFILE%"
 echo %CUR_DATE% %TIME%   JAVA NUKER COMPLETE. Recommend rebooting and washing your hands.
 
 :: Return exit code to SCCM/PDQ Deploy/PSexec/etc
 exit /B %EXIT_CODE%