Merge pull request #6939 from alvasw/seednodes_install_jdk_from_os_repo

seednode: Install openjdk-11-jdk from OS repository
bisq-network · Oct 31, 2023 · fa15db8 · fa15db8
2 parents 1280aa0 + f9fbfd2
commit fa15db8
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 345 deletions.
diff --git a/scripts/install_java.bat b/scripts/install_java.bat
diff --git a/scripts/install_java.sh b/scripts/install_java.sh
diff --git a/scripts/install_java_linux.sh b/scripts/install_java_linux.sh
diff --git a/scripts/install_java_macos.sh b/scripts/install_java_macos.sh
diff --git a/seednode/install_seednode_debian.sh b/seednode/install_seednode_debian.sh
@@ -7,7 +7,7 @@ echo "[*] Bisq Seednode installation script"
 
 ROOT_USER=root
 ROOT_GROUP=root
-ROOT_PKG="build-essential libtool autotools-dev automake pkg-config bsdmainutils python3 git vim screen ufw"
+ROOT_PKG="build-essential libtool autotools-dev automake pkg-config bsdmainutils python3 git vim screen ufw openjdk-11-jdk"
 ROOT_HOME=/root
 
 SYSTEMD_SERVICE_HOME=/etc/systemd/system
@@ -122,9 +122,6 @@ echo "[*] Moving Bisq repo"
 sudo -H -i -u "${ROOT_USER}" mv "${ROOT_HOME}/${BISQ_REPO_NAME}" "${BISQ_HOME}/${BISQ_REPO_NAME}"
 sudo -H -i -u "${ROOT_USER}" chown -R "${BISQ_USER}:${BISQ_GROUP}" "${BISQ_HOME}/${BISQ_REPO_NAME}"
 
-echo "[*] Installing OpenJDK 11.0.2 from Bisq repo"
-sudo -H -i -u "${ROOT_USER}" "${BISQ_HOME}/${BISQ_REPO_NAME}/scripts/install_java_linux.sh"
-
 echo "[*] Installing Bisq init script"
 sudo -H -i -u "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 "${BISQ_HOME}/${BISQ_REPO_NAME}/seednode/bisq.service" "${SYSTEMD_SERVICE_HOME}/bisq.service"
 if [ "${BITCOIN_INSTALL}" = true ];then