From 87c9af142fbc6b700ab8ef95db5e8f034affa5e6 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Tue, 8 Jan 2019 23:11:31 -0700
Subject: [PATCH] Preserve config/ when skipSetup

---
 net/net.sh | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/net/net.sh b/net/net.sh
index c6042e7a9..fec126943 100755
--- a/net/net.sh
+++ b/net/net.sh
@@ -158,7 +158,23 @@ build() {
 startCommon() {
   declare ipAddress=$1
   test -d "$SOLANA_ROOT"
-  ssh "${sshOptions[@]}" "$ipAddress" "mkdir -p ~/solana ~/.cargo/bin; rm -rf ~/solana/"
+  if $skipSetup; then
+    ssh "${sshOptions[@]}" "$ipAddress" "
+      set -x;
+      mkdir -p ~/solana/config{,-local}
+      rm -rf ~/config{,-local};
+      mv ~/solana/config{,-local} ~;
+      rm -rf ~/solana;
+      mkdir -p ~/solana ~/.cargo/bin;
+      mv ~/config{,-local} ~/solana/
+    "
+  else
+    ssh "${sshOptions[@]}" "$ipAddress" "
+      set -x;
+      rm -rf ~/solana;
+      mkdir -p ~/.cargo/bin
+    "
+  fi
   rsync -vPrc -e "ssh ${sshOptions[*]}" \
     "$SOLANA_ROOT"/{fetch-perf-libs.sh,scripts,net,multinode-demo} \
     "$ipAddress":~/solana/