From 846ad619417e8ff84864007d7af1fb8c6d888656 Mon Sep 17 00:00:00 2001
From: Rob Walker <rob@solana.com>
Date: Thu, 9 Aug 2018 17:42:25 -0700
Subject: [PATCH] use ~/.solana instead of PWD to keep cargo happy, don't rsync
 --append

---
 multinode-demo/client.sh    | 4 +---
 multinode-demo/common.sh    | 8 ++++----
 multinode-demo/drone.sh     | 2 +-
 multinode-demo/validator.sh | 5 ++---
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/multinode-demo/client.sh b/multinode-demo/client.sh
index 063567755..53bdd1c6e 100755
--- a/multinode-demo/client.sh
+++ b/multinode-demo/client.sh
@@ -51,15 +51,13 @@ rsync_leader_url=$(rsync_url "$leader")
 )
 
 iteration=0
+set -x
 while true; do
-  (
-    set -x
     $solana_bench_tps \
       -n "$count" \
       -l "$SOLANA_CONFIG_CLIENT_DIR"/leader.json \
       -k "$SOLANA_CONFIG_CLIENT_DIR"/client.json \
       "$@"
-  )
   [[ -n $loop ]] || exit 0
   iteration=$((iteration + 1))
   echo ------------------------------------------------------------------------
diff --git a/multinode-demo/common.sh b/multinode-demo/common.sh
index bdec0bb6a..23ac1e771 100644
--- a/multinode-demo/common.sh
+++ b/multinode-demo/common.sh
@@ -188,10 +188,10 @@ oom_score_adj() {
   fi
 }
 
-SOLANA_CONFIG_DIR=${SNAP_DATA:-$PWD}/config
-SOLANA_CONFIG_PRIVATE_DIR=${SNAP_DATA:-$PWD}/config-private
-SOLANA_CONFIG_VALIDATOR_DIR=${SNAP_DATA:-$PWD}/config-validator
-SOLANA_CONFIG_CLIENT_DIR=${SNAP_USER_DATA:-$PWD}/config-client
+SOLANA_CONFIG_DIR=${SNAP_DATA:-~/.solana}/config
+SOLANA_CONFIG_PRIVATE_DIR=${SNAP_DATA:-~/.solana}/config-private
+SOLANA_CONFIG_VALIDATOR_DIR=${SNAP_DATA:-~/.solana}/config-validator
+SOLANA_CONFIG_CLIENT_DIR=${SNAP_USER_DATA:-~/.solana}/config-client
 
 rsync_url() { # adds the 'rsync://` prefix to URLs that need it
   declare url="$1"
diff --git a/multinode-demo/drone.sh b/multinode-demo/drone.sh
index 1bee18dcf..4a35b7342 100755
--- a/multinode-demo/drone.sh
+++ b/multinode-demo/drone.sh
@@ -21,7 +21,7 @@ if [[ -d "$SNAP" ]]; then
   fi
   leader="$leader_address"
 else
-  leader=${1:-${here}/..}  # Default to local solana repo
+  leader=${1:-~/.solana}  # Default to ~/.solana for data
 fi
 
 [[ -f "$SOLANA_CONFIG_PRIVATE_DIR"/mint.json ]] || {
diff --git a/multinode-demo/validator.sh b/multinode-demo/validator.sh
index daed5386a..387540e71 100755
--- a/multinode-demo/validator.sh
+++ b/multinode-demo/validator.sh
@@ -43,7 +43,7 @@ if [[ -d $SNAP ]]; then
   leader=$leader_address
 else
   if [[ -z $1 ]]; then
-    leader=${1:-${here}/..}    # Default to local solana repo
+    leader=${1:-~/.solana}    # Default to ~/.solana for data
     leader_address=${2:-127.0.0.1}  # Default to local leader
   elif [[ -z $2 ]]; then
     leader=$1
@@ -94,8 +94,7 @@ rsync_leader_url=$(rsync_url "$leader")
 tune_networking
 
 set -ex
-$rsync --append --verbose --partial --progress --recursive \
-  "$rsync_leader_url"/config/ "$SOLANA_LEADER_CONFIG_DIR"
+$rsync -vPr "$rsync_leader_url"/config/ "$SOLANA_LEADER_CONFIG_DIR"
 [[ -d $SOLANA_LEADER_CONFIG_DIR/ledger ]] || {
   echo "Unable to retrieve ledger from $rsync_leader_url"
   exit 1