From: alex <alex@infiniteadaptability.org>
Date: Tue, 5 Jul 2022 23:09:05 +0000 (+0100)
Subject: ...
X-Git-Url: http://git.infiniteadaptability.org/?a=commitdiff_plain;h=6033d958c4edfe8779617eee4463ec01c0e73570;p=cold

...
---

diff --git a/cold-setup b/cold-setup
index 4d72ca4..e161b40 100755
--- a/cold-setup
+++ b/cold-setup
@@ -19,6 +19,7 @@ USB_DECRYPT_NAME="cold-usb"
 USB_PATH=
 USB_PATH_PRE_DECRYPT=
 
+BITCOIND="bitcoind -daemonwait -datadir=$DATA_DIRECTORY"
 BITCOIN_CLI="bitcoin-cli -datadir=$DATA_DIRECTORY"
 
 bitcoin_core_start() {
@@ -30,7 +31,7 @@ bitcoin_core_start() {
 
 	log_info "starting bitcoin core..."
 	mkdir -p "$DATA_DIRECTORY"
-	bitcoind -daemonwait -datadir="$DATA_DIRECTORY" &> /dev/null
+	eval "$BITCOIND" &> /dev/null
 	log_info "bitcoin core started"
 }
 
diff --git a/test/setup.sh b/test/setup.sh
index 6f5e2cd..6823a22 100644
--- a/test/setup.sh
+++ b/test/setup.sh
@@ -4,6 +4,7 @@ TEST_DIR=".testdir"
 
 source source.sh
 
+BITCOIND="bitcoind -daemonwait -datadir=$DATA_DIRECTORY chain=regtest"
 BITCOIN_CLI="bitcoin-cli -datadir=$DATA_DIRECTORY -chain=regtest"
 
 assert() {