Skip to content

fix jdk install and put in instrument apps #283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix jdk install and put in instrument apps #283

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1d6796b
fix jdk install and put in instrument apps
rerpha Sep 11, 2025
63ffd9f
ruff
rerpha Sep 11, 2025
6722437
ruff but from root
rerpha Sep 11, 2025
aa64b50
pull out JDK location to constant
rerpha Sep 11, 2025
cff768c
Update install_tasks.py
rerpha Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions installation_and_upgrade/ibex_install_utils/tasks/system_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import glob
import os
import shutil
import subprocess
import tempfile
import time
from pathlib import Path
Expand Down Expand Up @@ -46,6 +45,7 @@

EPICS_CRTL_PATH = os.path.join(EPICS_PATH, "crtl")

JAVA_INSTALL_BASE_PATH = os.path.join(APPS_BASE_DIR, "JDK")

DESKTOP_TRAINING_FOLDER_PATH = os.path.join(
os.environ["userprofile"], "desktop", "Mantid+IBEX training"
Expand Down Expand Up @@ -88,15 +88,20 @@ def check_java_installation(self) -> None:
"""
Checks Java installation
"""
installer, _ = Java().find_latest()
installer, version = Java().find_latest()

if os.path.exists(installer):
print(f"running installer at {installer}")
subprocess.call(
f"msiexec /i {installer} "

admin_commands = AdminCommandBuilder()
admin_commands.add_command(
f'msiexec /i "{installer}"',
"ADDLOCAL=FeatureMain,FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome "
'INSTALLDIR="c:\\Program Files\\Eclipse Adoptium\\" /quiet'
f'INSTALLDIR="{os.path.join(JAVA_INSTALL_BASE_PATH, version)}" /quiet',
expected_return_val=None,
)
admin_commands.run_all()

self.prompt.prompt_and_raise_if_not_yes(
"Make sure java installed correctly.\r\n"
"After following the installer, ensure you close and then re-open"
Expand Down
Loading