From 4972480b236455d8718490aeb3ae2e266d207fc2 Mon Sep 17 00:00:00 2001 From: Brad Miller Date: Fri, 16 Oct 2015 13:51:38 -0400 Subject: [PATCH] Updated the scripts to run as admin and manually start the robot programs. This will be reverted with a new image from NI --- .../src/main/resources/cpp-zip/ant/build.properties | 4 ++-- .../src/main/resources/java-zip/ant/build.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties index f76c5a8def..133be26b34 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties @@ -1,8 +1,8 @@ # Deployment information -username=lvuser +username=admin password= deploy.dir=/home/lvuser -deploy.kill.command=/usr/local/frc/bin/frcKillRobot.sh -t -r +deploy.kill.command=/usr/local/frc/bin/netconsole-host /home/lvuser/FRCUserProgram | /usr/local/frc/bin/FRC_ConsoleTee | tee /var/local/natinst/log/FRC_UserProgram.log command.dir=/home/lvuser/ # Libraries to use diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties index 3f2f2ea066..95ac04cacf 100644 --- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties +++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties @@ -1,8 +1,8 @@ # Deployment information -username=lvuser +username=admin password= deploy.dir=/home/lvuser -deploy.kill.command=. /etc/profile.d/natinst-path.sh; /usr/local/frc/bin/frcKillRobot.sh -t -r +deploy.kill.command=env LD_LIBRARY_PATH=/usr/local/frc/rpath-lib/ /usr/local/frc/bin/netconsole-host /usr/local/frc/JRE/bin/java -jar /home/lvuser/FRCUserProgram.jar | /usr/local/frc/bin/FRC_ConsoleTee | tee /var/local/natinst/log/FRC_UserProgram.log debug.flag.dir=/tmp/ debug.flag.command=chown lvuser:ni ${debug.flag.dir}frcdebug command.dir=/home/lvuser/