From 7154d755c1246f33eab1bdfb77d272b4234be291 Mon Sep 17 00:00:00 2001
From: Stephan Oeste <emzy@emzy.de>
Date: Wed, 6 Jul 2022 11:46:46 +0200
Subject: [PATCH 1/2] Disable confirmation prompt for rust install in prod
 install script

---
 production/install | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/production/install b/production/install
index 9f2533c61..ddb4f2a5d 100755
--- a/production/install
+++ b/production/install
@@ -1048,7 +1048,7 @@ case $OS in
     ;;
     Debian)
        echo "[*] Installing Rust from rustup.rs"
-       osSudo "${BITCOIN_USER}" sh -c "cd ${BITCOIN_ELECTRS_HOME} && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh"
+       osSudo "${BITCOIN_USER}" sh -c "cd ${BITCOIN_ELECTRS_HOME} && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y"
     ;;
 esac
 
@@ -1095,15 +1095,6 @@ echo "[*] Cloning Liquid Asset Registry testnet repo from ${LIQUIDTESTNET_ASSET_
 osSudo "${ELEMENTS_USER}" git config --global advice.detachedHead false
 osSudo "${ELEMENTS_USER}" git clone "${LIQUIDTESTNET_ASSET_REGISTRY_DB_URL}" "${ELEMENTS_HOME}/${LIQUIDTESTNET_ASSET_REGISTRY_DB_NAME}"
 
-case $OS in
-    FreeBSD)
-    ;;
-    Debian)
-       echo "[*] Installing Rust from rustup.rs"
-       osSudo "${BITCOIN_USER}" sh -c "cd ${BITCOIN_ELECTRS_HOME} && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh"
-    ;;
-esac
-
 echo "[*] Building Liquid Electrs release binary"
 osSudo "${ELEMENTS_USER}" sh -c "cd ${ELEMENTS_ELECTRS_HOME} && cargo run --release --features liquid --bin electrs -- --network liquid --version" || true
 

From 4a6f3e189d60fddd2fedfc7b9544a24fecd78e10 Mon Sep 17 00:00:00 2001
From: Stephan Oeste <emzy@emzy.de>
Date: Wed, 6 Jul 2022 12:11:13 +0200
Subject: [PATCH 2/2] Change shebang in scripts to be universal for prod
 install

---
 production/electrs-start-liquid  | 2 +-
 production/electrs-start-mainnet | 2 +-
 production/electrs-start-signet  | 2 +-
 production/electrs-start-testnet | 2 +-
 production/mempool-build-all     | 2 +-
 production/mempool-start-all     | 2 +-
 production/test-nginx            | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/production/electrs-start-liquid b/production/electrs-start-liquid
index 64564e7f7..a59004478 100755
--- a/production/electrs-start-liquid
+++ b/production/electrs-start-liquid
@@ -1,4 +1,4 @@
-#!/usr/local/bin/zsh
+#!/usr/bin/env zsh
 cd "${HOME}/electrs"
 #source "${HOME}/.cargo/env"
 #export PATH="${HOME}/.cargo/bin:${PATH}"
diff --git a/production/electrs-start-mainnet b/production/electrs-start-mainnet
index d6f964f73..32227afd2 100755
--- a/production/electrs-start-mainnet
+++ b/production/electrs-start-mainnet
@@ -1,4 +1,4 @@
-#!/usr/local/bin/zsh
+#!/usr/bin/env zsh
 cd "${HOME}/electrs"
 #source "${HOME}/.cargo/env"
 #export PATH="${HOME}/.cargo/bin:${PATH}"
diff --git a/production/electrs-start-signet b/production/electrs-start-signet
index 6f7919f83..c37b670f6 100755
--- a/production/electrs-start-signet
+++ b/production/electrs-start-signet
@@ -1,4 +1,4 @@
-#!/usr/local/bin/zsh
+#!/usr/bin/env zsh
 cd "${HOME}/electrs"
 #source "${HOME}/.cargo/env"
 #export PATH="${HOME}/.cargo/bin:${PATH}"
diff --git a/production/electrs-start-testnet b/production/electrs-start-testnet
index 7096629dd..42e057a52 100755
--- a/production/electrs-start-testnet
+++ b/production/electrs-start-testnet
@@ -1,4 +1,4 @@
-#!/usr/local/bin/zsh
+#!/usr/bin/env zsh
 cd "${HOME}/electrs"
 #source $HOME/.cargo/env
 #export PATH=$HOME/.cargo/bin:$PATH
diff --git a/production/mempool-build-all b/production/mempool-build-all
index d44569fe2..503f9dbf7 100755
--- a/production/mempool-build-all
+++ b/production/mempool-build-all
@@ -1,4 +1,4 @@
-#!/usr/local/bin/zsh
+#!/usr/bin/env zsh
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:$HOME/bin
 HOSTNAME=$(hostname)
 LOCATION=$(hostname|cut -d . -f2)
diff --git a/production/mempool-start-all b/production/mempool-start-all
index 5d5199166..d4a4ea6eb 100755
--- a/production/mempool-start-all
+++ b/production/mempool-start-all
@@ -1,4 +1,4 @@
-#!/usr/local/bin/zsh
+#!/usr/bin/env zsh
 export NVM_DIR="$HOME/.nvm"
 source "$NVM_DIR/nvm.sh"
 for site in mainnet liquid testnet bisq signet liquidtestnet
diff --git a/production/test-nginx b/production/test-nginx
index 2216689a4..c1cebd8d8 100755
--- a/production/test-nginx
+++ b/production/test-nginx
@@ -1,4 +1,4 @@
-#!/usr/local/bin/zsh
+#!/usr/bin/env zsh
 PROTO=https
 HOSTNAME=mempool.ninja
 URL_BASE=${PROTO}://${HOSTNAME}