...

diff --git a/cold-setup b/cold-setup
index 4d72ca41ec83df09ab31603851643162200c53a2..e161b40034c8fa808f2cdaaafd77e58537fc5064 100755 (executable)
--- 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 6f5e2cdc02d61971de991a9eedc99f961677cb45..6823a22b7b99fdf2cd93a6e3b0c9a9305840f928 100644 (file)
--- 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() {