blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Snap client-demo fixes

This commit is contained in:
Michael Vines 2018-07-13 23:37:56 -07:00
parent 4240edf710
commit 490d7875dd
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
multinode-demo/client.sh
View File

@ -7,7 +7,14 @@ here=$(dirname "$0")
# shellcheck source=multinode-demo/common.sh # shellcheck source=multinode-demo/common.sh
source "$here"/common.sh source "$here"/common.sh
leader=${1:-${here}/..} # Default to local solana repo leader=$1
if [[ -z $leader ]]; then
if [[ -d "$SNAP" ]]; then
leader=testnet.solana.com # Default to testnet when running as a Snap
else
leader=$here/.. # Default to local solana repo
fi
fi
count=${2:-1} count=${2:-1}
rsync_leader_url=$(rsync_url "$leader") rsync_leader_url=$(rsync_url "$leader")

7
multinode-demo/common.sh
View File

@ -14,6 +14,13 @@ if [[ -d "$SNAP" ]]; then # Running inside a Linux Snap?
else else
printf "%s/command-%s.wrapper" "$SNAP" "$program" printf "%s/command-%s.wrapper" "$SNAP" "$program"
fi fi
if [[ "$program" = client-demo ]]; then
# TODO: Merge client.sh functionality into solana-client-demo proper and
# remove this special case
printf "%s/bin/solana-%s" "$SNAP" "$program"
else
printf "%s/command-%s.wrapper" "$SNAP" "$program"
fi
} }
rsync="$SNAP"/bin/rsync rsync="$SNAP"/bin/rsync
SOLANA_METRICS_CONFIG="$(snapctl get metrics-config)" SOLANA_METRICS_CONFIG="$(snapctl get metrics-config)"