Merge remote-tracking branch 'upstream/main'

install/crafty-controller-install.sh

@@ -24,10 +24,7 @@ $STD apt-get install -y \
 msg_ok "Installed Dependencies"
 
 msg_info "Setting up TemurinJDK"
-mkdir -p /etc/apt/keyrings
-curl -fsSL "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
+setup_java
 $STD apt-get install -y temurin-{8,11,17,21}-jre
 sudo update-alternatives --set java /usr/lib/jvm/temurin-21-jre-arm64/bin/java
 msg_ok "Installed TemurinJDK"
@@ -41,7 +38,7 @@ $STD apt-get install -y \
 rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED
 msg_ok "Setup Python3"
 
-msg_info "Installing Craty-Controller (Patience)"
+msg_info "Installing Crafty-Controller (Patience)"
 useradd crafty -m -s /bin/bash
 cd /opt
 mkdir -p /opt/crafty-controller/crafty /opt/crafty-controller/server