From 98ee4b46726688634368700888fea38d803aac37 Mon Sep 17 00:00:00 2001
From: Rob Walker <rob@solana.com>
Date: Fri, 3 Aug 2018 17:02:27 -0700
Subject: [PATCH] fix up some nits in multinode-demo

---
 multinode-demo/setup.sh     |  4 ++--
 multinode-demo/validator.sh | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/multinode-demo/setup.sh b/multinode-demo/setup.sh
index 38e2c2df9..f6a699368 100755
--- a/multinode-demo/setup.sh
+++ b/multinode-demo/setup.sh
@@ -104,7 +104,7 @@ if $node_type_validator; then
   $solana_fullnode_config --keypair="$validator_id_path" "${validator_address_args[@]}" > "$SOLANA_CONFIG_VALIDATOR_DIR"/validator.json
 fi
 
-ls -lh "$SOLANA_CONFIG_DIR"/
+ls -lhR "$SOLANA_CONFIG_DIR"/
 if $node_type_leader; then
-  ls -lh "$SOLANA_CONFIG_PRIVATE_DIR"
+  ls -lhR "$SOLANA_CONFIG_PRIVATE_DIR"
 fi
diff --git a/multinode-demo/validator.sh b/multinode-demo/validator.sh
index 72b74dc80..26fbf8cd1 100755
--- a/multinode-demo/validator.sh
+++ b/multinode-demo/validator.sh
@@ -14,7 +14,7 @@ usage() {
   exit 1
 }
 
-if [[ $1 = -h || -n $3 ]]; then
+if [[ $1 = -h ]]; then
   usage
 fi
 
@@ -25,13 +25,17 @@ else
   self_setup=0
 fi
 
+if [[ -n $3 ]]; then
+  usage
+fi
+
 if [[ -d $SNAP ]]; then
   # Exit if mode is not yet configured
   # (typically the case after the Snap is first installed)
   [[ -n $(snapctl get mode) ]] || exit 0
 
   # Select leader from the Snap configuration
-  leader_address="$(snapctl get leader-address)"
+  leader_address=$(snapctl get leader-address)
   if [[ -z $leader_address ]]; then
     # Assume public testnet by default
     leader_address=35.230.65.68  # testnet.solana.com
@@ -41,9 +45,9 @@ else
   if [[ -z $1 ]]; then
     leader=${1:-${here}/..}    # Default to local solana repo
     leader_address=${2:-127.0.0.1}  # Default to local leader
-  elif [[ -z "$2" ]]; then
+  elif [[ -z $2 ]]; then
     leader=$1
-    leader_address=$(dig +short "$1" | head -n1)
+    leader_address=$(dig +short "${leader%:*}" | head -n1)
     if [[ -z $leader_address ]]; then
       usage "Error: unable to resolve IP address for $leader"
     fi