From d30670e92e9ab419e3f156c74ae64623afdb936d Mon Sep 17 00:00:00 2001
From: Rob Walker <rob@solana.com>
Date: Thu, 14 Jun 2018 17:11:55 -0700
Subject: [PATCH] clean up demo bash scripts

 * allow other level of RUST logging
 * avoid "echo" in favor of printf (builtin)
 * single quotes for literals, double quotes for variables
---
 multinode-demo/client.sh    | 20 +++++++++-----------
 multinode-demo/leader.sh    |  5 ++++-
 multinode-demo/validator.sh | 17 ++++++++---------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/multinode-demo/client.sh b/multinode-demo/client.sh
index 32f0b660e2..14dea2e27a 100755
--- a/multinode-demo/client.sh
+++ b/multinode-demo/client.sh
@@ -1,20 +1,18 @@
 #!/bin/bash -e
 
-if [[ -z "$1" ]]; then
-  echo "usage: $0 [network path to solana repo on leader machine] [number of nodes in the network if greater then 1]"
+if [[ -z $1 ]]; then
+  printf 'usage: %s [network path to solana repo on leader machine] [number of nodes in the network if greater then 1]' "$0"
   exit 1
 fi
 
-LEADER="$1"
-COUNT="$2"
-if [[ -z "$2" ]]; then
-    COUNT=1
-fi
+LEADER=$1
+COUNT=${2:-1}
 
 set -x
-export RUST_LOG=solana=info
-rsync -v -e ssh "$LEADER/leader.json" .
-rsync -v -e ssh "$LEADER/mint-demo.json" .
+rsync -v -e ssh "$LEADER"/{leader.json,mint-demo.json} .
+
+# if RUST_LOG is unset, default to info
+export RUST_LOG=${RUST_LOG:-solana=info}
 
 cargo run --release --bin solana-client-demo -- \
-  -n $COUNT -l leader.json -d < mint-demo.json 2>&1 | tee client.log
+  -n "$COUNT" -l leader.json -d < mint-demo.json 2>&1 | tee client.log
diff --git a/multinode-demo/leader.sh b/multinode-demo/leader.sh
index e85dad91c6..29dbb25c2a 100755
--- a/multinode-demo/leader.sh
+++ b/multinode-demo/leader.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
-export RUST_LOG=solana=info
+
+# if RUST_LOG is unset, default to info
+export RUST_LOG=${RUST_LOG:-solana=info}
+
 sudo sysctl -w net.core.rmem_max=26214400
 cargo run --release --bin solana-fullnode -- -l leader.json < genesis.log
diff --git a/multinode-demo/validator.sh b/multinode-demo/validator.sh
index 464dcbb669..b3a3a24b58 100755
--- a/multinode-demo/validator.sh
+++ b/multinode-demo/validator.sh
@@ -1,21 +1,20 @@
-#!/bin/bash -e
+#!/bin/bash
 
-if [[ -z "$1" ]]; then
-  echo "usage: $0 [network path to solana repo on leader machine]"
+if [[ -z $1 ]]; then
+  printf 'usage: %s [network path to solana repo on leader machine]\n' "$0"
   exit 1
 fi
 
-LEADER="$1"
+LEADER=$1
 
 set -x
 
-rsync -v -e ssh "$LEADER/mint-demo.json" .
-rsync -v -e ssh "$LEADER/leader.json" .
-rsync -v -e ssh "$LEADER/genesis.log" .
-
-export RUST_LOG=solana=info
+rsync -v -e ssh "$LEADER"/{mint-demo.json,leader.json,genesis.log} . || exit $?
 
 sudo sysctl -w net.core.rmem_max=26214400
 
+# if RUST_LOG is unset, default to info
+export RUST_LOG=${RUST_LOG:-solana=info}
+
 cargo run --release --bin solana-fullnode -- \
     -l validator.json -v leader.json < genesis.log