From cefa6e8084ad09a9d69f99eacc070ae58e7de879 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Tue, 14 Feb 2023 13:59:24 -0500
Subject: [PATCH] Add a helper to better detect if java is installed

---
 app/classes/shared/helpers.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index 6320d60e..ff8583be 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -15,6 +15,7 @@ import html
 import zipfile
 import pathlib
 import ctypes
+import shutil
 import subprocess
 import itertools
 from datetime import datetime
@@ -145,6 +146,24 @@ class Helpers:
             logger.error(f"Unable to resolve remote bedrock download url! \n{e}")
         return False
 
+    def detect_java(self):
+        if len(self.find_java_installs()) > 0:
+            return True
+        else:
+            # We'll use this as a fallback for systems
+            # That do not properly setup reg keys or
+            # Update alternatives
+            if self.is_os_windows():
+                if shutil.which("java.exe"):
+                    return True
+                else:
+                    return False
+            else:
+                if shutil.which("java"):
+                    return True
+                else:
+                    return False
+
     @staticmethod
     def find_java_installs():
         # If we're windows return oracle java versions,