From 609b18c2cd6b798f66583a85423491b6b4375c8f Mon Sep 17 00:00:00 2001 From: Trent Nelson Date: Thu, 5 Sep 2019 17:14:15 -0600 Subject: [PATCH] multinode-demo/validator.sh: Correct `new_genesis_block()` logic (#5812) automerge --- multinode-demo/validator.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/multinode-demo/validator.sh b/multinode-demo/validator.sh index adf85f99c..190f47f6b 100755 --- a/multinode-demo/validator.sh +++ b/multinode-demo/validator.sh @@ -227,8 +227,13 @@ new_genesis_block() { curl -f "$rpc_url"/genesis.tar.bz2 -o "$ledger_dir"/new-genesis.tar.bz2 ) || { echo "Error: failed to fetch new genesis ledger" + rm -f "$ledger_dir"/new-genesis.tar.bz2 } - ! diff -q "$ledger_dir"/new-genesis.tar.bz2 "$ledger_dir"/genesis.tar.bz2 >/dev/null 2>&1 + if [[ -f "$ledger_dir"/new-genesis.tar.bz2 ]]; then + diff -q "$ledger_dir"/new-genesis.tar.bz2 "$ledger_dir"/genesis.tar.bz2 >/dev/null 2>&1 && false + else + false + fi } set -e