LP1944999: Remove Local Java / JavaFX When Uninstalling

We put them there, we take them out.

Signed-off-by: Jason Boyer <jboyer@equinoxinitiative.org>
Signed-off-by: Garry Collum <gcollum@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>

diff --git a/installer/windows/hatch.nsi b/installer/windows/hatch.nsi
index 08ef332..1cd0a54 100644 (file)
--- a/installer/windows/hatch.nsi
+++ b/installer/windows/hatch.nsi
@@ -200,6 +200,9 @@ section "uninstall"
     ; blindly using /r isn't ideal but the extreme unlikelyhood of there being \lib or \extension folders under $PROGRAMFILES makes it low risk.
     RmDir /r /REBOOTOK "$INSTDIR\extension"
     RmDir /r /REBOOTOK "$INSTDIR\lib"
+    RmDir /r /REBOOTOK "$INSTDIR\java-jdk-win"
+    RmDir /r /REBOOTOK "$INSTDIR\javafx-sdk-win"
+
     # Delete uninstaller last
     Delete /REBOOTOK "$INSTDIR\Uninstall ${APPNAME}.exe"