From 00388f581befd54f498a219b31395a443f8809f4 Mon Sep 17 00:00:00 2001
From: Jason Boyer <jboyer@equinoxinitiative.org>
Date: Fri, 24 Sep 2021 12:57:02 -0400
Subject: [PATCH] LP1944999: Remove Local Java / JavaFX When Uninstalling
We put them there, we take them out.
Signed-off-by: Jason Boyer <jboyer@equinoxinitiative.org>
---
installer/windows/hatch.nsi | 3 +++
1 file changed, 3 insertions(+)
diff --git a/installer/windows/hatch.nsi b/installer/windows/hatch.nsi
index 08ef332e4d..1cd0a541a3 100644
--- 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"
--
2.11.0