From d680f6b3a532ba92859841c81072011930843f09 Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Thu, 28 Jun 2018 12:56:53 -0600 Subject: [PATCH] Fix bash scripts: * Use wallet name everywhere * Update drone to use mint.json --- multinode-demo/common.sh | 2 +- multinode-demo/drone.sh | 4 ++-- multinode-demo/{simple-client.sh => wallet.sh} | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) rename multinode-demo/{simple-client.sh => wallet.sh} (75%) diff --git a/multinode-demo/common.sh b/multinode-demo/common.sh index fb9f607555..03f97ca2a7 100644 --- a/multinode-demo/common.sh +++ b/multinode-demo/common.sh @@ -38,7 +38,7 @@ else fi solana_client_demo=$(solana_program client-demo) -solana_simple_client_demo=$(solana_program simple-client-demo) +solana_wallet=$(solana_program wallet) solana_drone=$(solana_program drone) solana_fullnode=$(solana_program fullnode) solana_fullnode_config=$(solana_program fullnode-config) diff --git a/multinode-demo/drone.sh b/multinode-demo/drone.sh index de9902364e..8c40f80c4e 100755 --- a/multinode-demo/drone.sh +++ b/multinode-demo/drone.sh @@ -28,8 +28,8 @@ rsync_leader_url=$(rsync_url "$leader") set -ex mkdir -p $SOLANA_CONFIG_DIR rsync -vPz "$rsync_leader_url"/config/leader.json $SOLANA_CONFIG_DIR/ -rsync -vPz "$rsync_leader_url"/config/mint-demo.json $SOLANA_CONFIG_DIR/ +rsync -vPz "$rsync_leader_url"/config/mint.json $SOLANA_CONFIG_DIR/ # shellcheck disable=SC2086 # $solana_drone should not be quoted exec $solana_drone \ - -l $SOLANA_CONFIG_DIR/leader.json < $SOLANA_CONFIG_DIR/mint-demo.json + -l $SOLANA_CONFIG_DIR/leader.json < $SOLANA_CONFIG_DIR/mint.json diff --git a/multinode-demo/simple-client.sh b/multinode-demo/wallet.sh similarity index 75% rename from multinode-demo/simple-client.sh rename to multinode-demo/wallet.sh index 36ede985f2..f71359ebf8 100755 --- a/multinode-demo/simple-client.sh +++ b/multinode-demo/wallet.sh @@ -15,7 +15,8 @@ rsync_leader_url=$(rsync_url "$leader") set -ex mkdir -p $SOLANA_CONFIG_DIR rsync -vPz "$rsync_leader_url"/config/leader.json $SOLANA_CONFIG_DIR/ +rsync -vPz "$rsync_leader_url"/config/mint.json $SOLANA_CONFIG_DIR/ # shellcheck disable=SC2086 # $solana_simple_client_demo should not be quoted -exec $solana_simple_client_demo \ - -l $SOLANA_CONFIG_DIR/leader.json -d +exec $solana_wallet \ + -l $SOLANA_CONFIG_DIR/leader.json -m $SOLANA_CONFIG_DIR/mint.json -d