From 93301d1c817b356b14d8dc8c5ea4eafa4c89a48a Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2020 23:38:41 -0800 Subject: [PATCH] Make run.sh not overwrite genesis if existing (#7837) (#7939) automerge --- run.sh | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/run.sh b/run.sh index f6cb707af1..23261b7816 100755 --- a/run.sh +++ b/run.sh @@ -77,16 +77,20 @@ else solana-keygen new --no-passphrase -fso "$leader_storage_account_keypair" fi -solana-genesis \ - --hashes-per-tick sleep \ - --faucet-pubkey "$dataDir"/faucet-keypair.json \ - --faucet-lamports 500000000000000000 \ - --bootstrap-leader-pubkey "$dataDir"/leader-keypair.json \ - --bootstrap-vote-pubkey "$dataDir"/leader-vote-account-keypair.json \ - --bootstrap-stake-pubkey "$dataDir"/leader-stake-account-keypair.json \ - --bootstrap-storage-pubkey "$dataDir"/leader-storage-account-keypair.json \ - --ledger "$ledgerDir" \ - --operating-mode development +if [[ -e "$ledgerDir"/genesis.bin ]]; then + echo "Use existing genesis" +else + solana-genesis \ + --hashes-per-tick sleep \ + --faucet-pubkey "$dataDir"/faucet-keypair.json \ + --faucet-lamports 500000000000000000 \ + --bootstrap-leader-pubkey "$dataDir"/leader-keypair.json \ + --bootstrap-vote-pubkey "$dataDir"/leader-vote-account-keypair.json \ + --bootstrap-stake-pubkey "$dataDir"/leader-stake-account-keypair.json \ + --bootstrap-storage-pubkey "$dataDir"/leader-storage-account-keypair.json \ + --ledger "$ledgerDir" \ + --operating-mode development +fi abort() { set +e