From eb8336331f4286279ea264b662d38d7f7cab65dc Mon Sep 17 00:00:00 2001 From: lisa neigut Date: Fri, 12 Apr 2019 12:03:59 -0700 Subject: [PATCH] contrib-script: make it so that you can source everywhere the aliases are nice to have in other windows; if you want to source it other places, we should make that possible. --- contrib/startup_regtest.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/contrib/startup_regtest.sh b/contrib/startup_regtest.sh index 39789a371..da7bea880 100755 --- a/contrib/startup_regtest.sh +++ b/contrib/startup_regtest.sh @@ -8,7 +8,7 @@ ## ## $ source contrib/startup_regtest.sh ## Bitcoin server starting -## +## ## Let's connect the nodes. ## ## $ l2-cli getinfo | jq .id @@ -57,11 +57,14 @@ addr=localhost:9090 EOF # Start bitcoind in the background -bitcoind -daemon -regtest +test -f "$PATH_TO_BITCOIN/regtest/bitcoind.pid" || \ + bitcoind -daemon -regtest # Start the lightning nodes -"$PATH_TO_LIGHTNING/lightningd/lightningd" --lightning-dir=/tmp/l1-regtest -"$PATH_TO_LIGHTNING/lightningd/lightningd" --lightning-dir=/tmp/l2-regtest +test -f /tmp/l1-regtest/lightningd-regtest.pid || \ + "$PATH_TO_LIGHTNING/lightningd/lightningd" --lightning-dir=/tmp/l1-regtest +test -f /tmp/l2-regtest/lightningd-regtest.pid || \ + "$PATH_TO_LIGHTNING/lightningd/lightningd" --lightning-dir=/tmp/l2-regtest alias l1-cli='$PATH_TO_LIGHTNING/cli/lightning-cli --lightning-dir=/tmp/l1-regtest' alias l2-cli='$PATH_TO_LIGHTNING/cli/lightning-cli --lightning-dir=/tmp/l2-regtest'