From ff991b87da51e4315dc67b1d7bb01280735c6b98 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Tue, 28 Aug 2018 20:55:13 -0700
Subject: [PATCH] Add support for deploying from non-Linux machines

---
 net/net.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net/net.sh b/net/net.sh
index 4c73fb84c5..1fe566fecf 100755
--- a/net/net.sh
+++ b/net/net.sh
@@ -41,9 +41,9 @@ done
 loadConfigFile
 
 build() {
+  declare MAYBE_DOCKER=
   if [[ $(uname) != Linux ]]; then
-    echo "Unable to build, this isn't a Linux system"
-    exit 1
+    MAYBE_DOCKER="ci/docker-run.sh solanalabs/rust"
   fi
   SECONDS=0
   (
@@ -51,9 +51,9 @@ build() {
     echo "****************"
     echo "Build started at $(date)"
 
-    # Build and install locally
-    PATH="$HOME"/.cargo/bin:"$PATH"
-    cargo install --force
+    set -x
+    rm -rf farf
+    $MAYBE_DOCKER cargo install --root farf
   )
   echo "Build took $SECONDS seconds"
 }
@@ -90,7 +90,7 @@ startLeader() {
 
   (
     set -x
-    rsync -vPrz -e "ssh ${sshOptions[*]}" ~/.cargo/bin/solana* "$ipAddress":~/.cargo/bin/
+    rsync -vPrz -e "ssh ${sshOptions[*]}" "$SOLANA_ROOT"/farf/bin/* "$ipAddress":~/.cargo/bin/
     ssh "${sshOptions[@]}" -f "$ipAddress" \
       "./solana/net/remote/remote_leader.sh"
   ) >> "$logFile"