From 7c396430e36df336674c623588cbf1934e646c4a Mon Sep 17 00:00:00 2001
From: thatmadhacker <finman292004@gmail.com>
Date: Thu, 24 Jan 2019 19:31:07 -0500
Subject: [PATCH] Realised that i was on cameraserver and not master when i
 made this branch

---
 pi_scripts/installVisionProcessOnPi.sh   | 8 +-------
 pi_scripts/restartVisionProcessOnPi.sh   | 4 +---
 pi_scripts/uninstallVisionProcessOnPi.sh | 4 +---
 pi_scripts/windows/pushCodeToPi.sh       | 2 +-
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/pi_scripts/installVisionProcessOnPi.sh b/pi_scripts/installVisionProcessOnPi.sh
index 6a09a1f..1d35837 100755
--- a/pi_scripts/installVisionProcessOnPi.sh
+++ b/pi_scripts/installVisionProcessOnPi.sh
@@ -25,11 +25,5 @@ fi
 # TODO Explain-y comments
 
 scp ${PI_USER}@${PI_ADDR} pi_scripts/vision.service ${PI_USER}@${PI_ADDR}:/tmp
-ssh ${PI_USER}@${PI_ADDR} "sudo cp /tmp/vision.service /etc/systemd/system"
-ssh ${PI_USER}@${PI_ADDR} "sudo systemctl stop vision.service"
-ssh ${PI_USER}@${PI_ADDR} "sudo systemctl disable vision.service"
-ssh ${PI_USER}@${PI_ADDR} "sudo systemctl daemon-reload"
-ssh ${PI_USER}@${PI_ADDR} "sudo systemctl enable vision.service"
-ssh ${PI_USER}@${PI_ADDR} "sudo systemctl start vision.service"
-
+ssh ${PI_USER}@${PI_ADDR} "sudo cp /tmp/vision.service /etc/systemd/system && sudo systemctl stop vision.service && sudo systemctl disable vision.service && sudo systemctl daemon-reload && sudo systemctl enable vision.service && sudo systemctl start vision.service"
 
diff --git a/pi_scripts/restartVisionProcessOnPi.sh b/pi_scripts/restartVisionProcessOnPi.sh
index ee5c3a8..37671c6 100755
--- a/pi_scripts/restartVisionProcessOnPi.sh
+++ b/pi_scripts/restartVisionProcessOnPi.sh
@@ -24,6 +24,4 @@ fi
 
 # SSH to the pi and restart the vision process
 echo "Restarting vision process on ${PI_USER}@${PI_ADDR}"
-ssh ${PI_USER}@${PI_ADDR} "sudo systemctl stop vision.service"
-ssh ${PI_USER}@${PI_ADDR} "sudo systemctl daemon-reload"
-ssh ${PI_USER}@${PI_ADDR} "sudo systemctl start vision.service"
+ssh ${PI_USER}@${PI_ADDR} "sudo systemctl stop vision.service && sudo systemctl daemon-reload && sudo systemctl start vision.service"
diff --git a/pi_scripts/uninstallVisionProcessOnPi.sh b/pi_scripts/uninstallVisionProcessOnPi.sh
index c821478..dcbf866 100755
--- a/pi_scripts/uninstallVisionProcessOnPi.sh
+++ b/pi_scripts/uninstallVisionProcessOnPi.sh
@@ -13,6 +13,4 @@ if [[ $1 != "" ]]; then
   PI_ADDR=$1
 fi
 
-ssh ${PI_USER}@${PI_ADDR} "sudo systemctl stop vision.service"
-ssh ${PI_USER}@${PI_ADDR} "sudo systemctl disable vision.service"
-ssh ${PI_USER}@${PI_ADDR} "sudo rm /etc/systemd/system/vision.service"
+ssh ${PI_USER}@${PI_ADDR} "sudo systemctl stop vision.service && sudo systemctl disable vision.service && sudo rm /etc/systemd/system/vision.service"
diff --git a/pi_scripts/windows/pushCodeToPi.sh b/pi_scripts/windows/pushCodeToPi.sh
index 0bd4a78..c19abb9 100755
--- a/pi_scripts/windows/pushCodeToPi.sh
+++ b/pi_scripts/windows/pushCodeToPi.sh
@@ -23,7 +23,7 @@ fi
 echo "Make sure you've done a \"git pull\" so that you're deploying the latest code!"
 echo
 
-./gradlew build -PbuildType=arm-raspbian -PtestType=windows
+gradlew build -PbuildType=arm-raspbian -PtestType=windows
 
 # ERROR HANDLING: check that the build succeeded
 if [ $? -ne 0 ]; then