From 609f96e15d4ef2a4c4da777ab37e1b9407e0afc1 Mon Sep 17 00:00:00 2001 From: Adam Goldsmith Date: Sat, 5 Mar 2016 13:28:49 -0500 Subject: [PATCH] Update hostname in Makefile, make it slightly more verbose --- Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 99c08a2..36efedf 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,9 @@ CXX=arm-frc-linux-gnueabi-g++ override CPPFLAGS +=-std=c++14 LDFLAGS=-l$(LIBS) TEAM=1786 -SSH_OPTIONS=-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no +SSH_OPTIONS=-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no SSH_SSHPASS=$(shell command -v sshpass >/dev/null 2>&1 && echo -n "sshpass -p ''") +SSH_HOST=roborio-1786-frc.local all: deploy @@ -19,16 +20,16 @@ clean: deploy: build @echo "Copying FRCUserProgram" - @ssh $(SSH_OPTIONS) lvuser@10.17.86.20 'rm -f /home/lvuser/FRCUserProgram' - @scp $(SSH_OPTIONS) -o "LogLevel QUIET" FRCUserProgram lvuser@10.17.86.20:/home/lvuser/FRCUserProgram + ssh $(SSH_OPTIONS) lvuser@$(SSH_HOST) 'rm -f /home/lvuser/FRCUserProgram' + scp $(SSH_OPTIONS) -o "LogLevel QUIET" FRCUserProgram lvuser@$(SSH_HOST):/home/lvuser/FRCUserProgram @echo "Restarting FRCUserProgram" - @$(SSH_SSHPASS) ssh $(SSH_OPTIONS) admin@10.17.86.20 '. /etc/profile.d/natinst-path.sh; /usr/local/frc/bin/frcKillRobot.sh -t -r' + $(SSH_SSHPASS) ssh $(SSH_OPTIONS) admin@$(SSH_HOST) '. /etc/profile.d/natinst-path.sh; /usr/local/frc/bin/frcKillRobot.sh -t -r' restart: FRCUserProgram - @echo "Restarting FRCUserProgram" - @$(SSH_SSHPASS) ssh $(SSH_OPTIONS) admin@10.17.86.20 '. /etc/profile.d/natinst-path.sh; /usr/local/frc/bin/frcKillRobot.sh -t -r' + echo "Restarting FRCUserProgram" + $(SSH_SSHPASS) ssh $(SSH_OPTIONS) admin@$(SSH_HOST) '. /etc/profile.d/natinst-path.sh; /usr/local/frc/bin/frcKillRobot.sh -t -r' stop: @echo "Restarting FRCUserProgram" - @$(SSH_SSHPASS) ssh $(SSH_OPTIONS) admin@10.17.86.20 '. /etc/profile.d/natinst-path.sh; /usr/local/frc/bin/frcKillRobot.sh -t'y + $(SSH_SSHPASS) ssh $(SSH_OPTIONS) admin@$(SSH_HOST) '. /etc/profile.d/natinst-path.sh; /usr/local/frc/bin/frcKillRobot.sh -t'y