From 9c65ff3e12191c5492d04b4b7dd85524d88e3b7d Mon Sep 17 00:00:00 2001
From: Stephan Oeste <emzy@emzy.de>
Date: Tue, 5 Jul 2022 14:09:32 +0200
Subject: [PATCH] Fix Bisq Java install script name for prod install script

---
 production/install | 67 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 61 insertions(+), 6 deletions(-)

diff --git a/production/install b/production/install
index 5fbf27b78..649a5f68f 100755
--- a/production/install
+++ b/production/install
@@ -1134,8 +1134,8 @@ if [ "${BISQ_INSTALL}" = ON ];then
             echo "[*] Cloning Bisq top-level repo"
             osSudo "${BISQ_USER}" git clone --branch "${BISQ_REPO_BRANCH}" "${BISQ_REPO_URL}" "${BISQ_HOME}/${BISQ_REPO_NAME}"
 
-            echo "[*] Installing OpenJDK 10.0.2 from Bisq install_java.sh script"
-            osSudo "${ROOT_USER}" "${BISQ_HOME}/${BISQ_REPO_NAME}/scripts/install_java.sh"
+            echo "[*] Installing OpenJDK from Bisq install_java_linux.sh script"
+            osSudo "${ROOT_USER}" "${BISQ_HOME}/${BISQ_REPO_NAME}/scripts/install_java_linux.sh"
 
             echo "[*] Checking out Bisq ${BISQ_LATEST_RELEASE}"
             osSudo "${BISQ_USER}" sh -c "cd ${BISQ_HOME}/${BISQ_REPO_NAME} && git checkout ${BISQ_LATEST_RELEASE}"
@@ -1197,7 +1197,61 @@ if [ "${BITCOIN_MAINNET_ENABLE}" = ON ];then
         ;;
 
         Debian)
-            osSudo "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/bitcoin-mainnet.service" "${DEBIAN_SERVICE_HOME}"
+            osSudo "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/linux/bitcoin.service" "${DEBIAN_SERVICE_HOME}"
+        ;;
+    esac
+fi
+
+################################
+# Bitcoin instance for Testnet #
+################################
+
+if [ "${BITCOIN_MAINNET_ENABLE}" = ON ];then
+    echo "[*] Installing Bitcoin Testnet service"
+    case $OS in
+
+        FreeBSD)
+            echo "[*] FIXME: Bitcoin Testnet service must be installed manually on FreeBSD"
+        ;;
+
+        Debian)
+            osSudo "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/linux/bitcoin-testnet.service" "${DEBIAN_SERVICE_HOME}"
+        ;;
+    esac
+fi
+
+###############################
+# Bitcoin instance for Signet #
+###############################
+
+if [ "${BITCOIN_MAINNET_ENABLE}" = ON ];then
+    echo "[*] Installing Bitcoin Signet service"
+    case $OS in
+
+        FreeBSD)
+            echo "[*] FIXME: Bitcoin Signet service must be installed manually on FreeBSD"
+        ;;
+
+        Debian)
+            osSudo "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/linux/bitcoin-signet.service" "${DEBIAN_SERVICE_HOME}"
+        ;;
+    esac
+fi
+
+###############################
+# Bitcoin instance for Liquid #
+###############################
+
+if [ "${BITCOIN_MAINNET_ENABLE}" = ON ];then
+    echo "[*] Installing Bitcoin Liquid service"
+    case $OS in
+
+        FreeBSD)
+            echo "[*] FIXME: Bitcoin Liquid service must be installed manually on FreeBSD"
+        ;;
+
+        Debian)
+            osSudo "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/linux/liquid.service" "${DEBIAN_SERVICE_HOME}"
         ;;
     esac
 fi
@@ -1414,21 +1468,22 @@ case $OS in
         fi
         if [ "${BITCOIN_MAINNET_ENABLE}" = ON ];then
             osSudo "${ROOT_USER}" systemctl enable bitcoin.service
-            osSudo "${ROOT_USER}" systemctl enable electrs.service
             osSudo "${ROOT_USER}" systemctl enable mempool.service
         fi
         if [ "${BITCOIN_TESTNET_ENABLE}" = ON ];then
             osSudo "${ROOT_USER}" systemctl enable bitcoin-testnet.service
-            osSudo "${ROOT_USER}" systemctl enable electrs-testnet.service
             osSudo "${ROOT_USER}" systemctl enable mempool-testnet.service
         fi
+        if [ "${BITCOIN_SIGNET_ENABLE}" = ON ];then
+            osSudo "${ROOT_USER}" systemctl enable bitcoin-signet.service
+            osSudo "${ROOT_USER}" systemctl enable mempool-signet.service
+        fi
         if [ "${BISQ_MAINNET_ENABLE}" = ON ];then
             osSudo "${ROOT_USER}" systemctl enable bisq.service
             osSudo "${ROOT_USER}" systemctl enable mempool-bisq.service
         fi
         if [ "${ELEMENTS_LIQUID_ENABLE}" = ON ];then
             osSudo "${ROOT_USER}" systemctl enable liquid.service
-            osSudo "${ROOT_USER}" systemctl enable electrs-liquid.service
             osSudo "${ROOT_USER}" systemctl enable mempool-liquid.service
         fi
     ;;