From e797cba5046e94bb756ae03036997f6240b2ade7 Mon Sep 17 00:00:00 2001 From: Tobias <96661824+CrazyWolf13@users.noreply.github.com> Date: Wed, 12 Feb 2025 08:20:35 +0100 Subject: [PATCH] fix: fix default java version (#2286) --- install/crafty-controller-install.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/install/crafty-controller-install.sh b/install/crafty-controller-install.sh index b02322e3..6e5f6878 100644 --- a/install/crafty-controller-install.sh +++ b/install/crafty-controller-install.sh @@ -26,19 +26,14 @@ $STD apt-get install -y \ software-properties-common msg_ok "Installed Dependencies" -msg_info "Setting up TermurinJDK" +msg_info "Setting up TemurinJDK" mkdir -p /etc/apt/keyrings wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list $STD apt-get update -$STD apt-get install -y \ - temurin-8-jre \ - temurin-11-jre \ - temurin-17-jre \ - temurin-21-jre \ - temurin-23-jre +$STD apt-get install -y temurin-{8,11,17,21}-jre sudo update-alternatives --set java /usr/lib/jvm/temurin-21-jre-amd64/bin/java -msg_ok "Installed TermurinJDK" +msg_ok "Installed TemurinJDK" msg_info "Setup Python3" $STD apt-get install -y \ @@ -49,7 +44,6 @@ $STD apt-get install -y \ rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED msg_ok "Setup Python3" - msg_info "Installing Craty-Controller (Patience)" useradd crafty -m -s /bin/bash cd /opt @@ -81,7 +75,7 @@ After=network.target Type=simple User=crafty WorkingDirectory=/opt/crafty-controller/crafty/crafty-4 -Environment=PATH=/opt/crafty-controller/crafty/.venv/bin:$PATH +Environment=PATH=/usr/lib/jvm/temurin-21-jre-amd64/bin:/opt/crafty-controller/crafty/.venv/bin:$PATH ExecStart=/opt/crafty-controller/crafty/.venv/bin/python3 main.py -d Restart=on-failure