From 4dc666af5542410bb9feed8a9c50dfe17eb4bd49 Mon Sep 17 00:00:00 2001 From: Toby Date: Tue, 1 May 2018 19:07:51 +0100 Subject: [PATCH] #57 remove original start/stop scripts, they should be covered in the standard scripts / application.ini etc --- package.sbt | 4 ---- src/debian/bin/start-client.sh | 25 ------------------------- src/debian/bin/start-server.sh | 27 --------------------------- src/debian/bin/start.sh | 25 ------------------------- src/debian/bin/stop.sh | 12 ------------ 5 files changed, 93 deletions(-) delete mode 100755 src/debian/bin/start-client.sh delete mode 100755 src/debian/bin/start-server.sh delete mode 100755 src/debian/bin/start.sh delete mode 100755 src/debian/bin/stop.sh diff --git a/package.sbt b/package.sbt index 9f1d122..49f1343 100644 --- a/package.sbt +++ b/package.sbt @@ -8,10 +8,6 @@ packageDescription := """Homebrew temperature data logger based on the DS18B20 s debianPackageDependencies in Debian ++= Seq("java8-runtime | oracle-java8-jdk") -linuxPackageMappings in Debian += packageDirectoryAndContentsMapping( - (sourceDirectory.value / "debian" / "bin") -> s"/usr/share/${packageName.value}/bin" -) - // don't package JavaDoc or source mappings in (Compile, packageDoc) := Seq() diff --git a/src/debian/bin/start-client.sh b/src/debian/bin/start-client.sh deleted file mode 100755 index 3bec560..0000000 --- a/src/debian/bin/start-client.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -TEMPERATURE_HOME=~/.temperature -LOG_FILE=${TEMPERATURE_HOME}/temperature-machine.log - -ETH0=`grep "eth0" /proc/net/dev` -if [ -n "$ETH0" ] ; then - LAN="eth0" -else - LAN="wlan0" -fi -IP=$( ip -f inet addr show ${LAN} | grep -Po 'inet \K[\d.]+' ) - -mkdir ${TEMPERATURE_HOME} -p - -nohup java -Xmx512m -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=${IP} -cp target/scala-2.12/temperature-machine-2.1.jar bad.robot.temperature.client.Client > ${LOG_FILE} 2>&1 & - -rm -f temperature-machine.log -ln -s -F ${LOG_FILE} temperature-machine.log - -echo "$!" > temperature-machine.pid -echo "Started your temperature-machine (client-mode);" -echo " Redirecting output to ${LOG_FILE}" -echo " PID stored in temperature-machine.pid" -echo " JMX enabled, discovered ${LAN} on ${IP}" diff --git a/src/debian/bin/start-server.sh b/src/debian/bin/start-server.sh deleted file mode 100755 index d9b831f..0000000 --- a/src/debian/bin/start-server.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash - -args=("$@") - -TEMPERATURE_HOME=~/.temperature -LOG_FILE=${TEMPERATURE_HOME}/temperature-machine.log - -ETH0=`grep "eth0" /proc/net/dev` -if [ -n "$ETH0" ] ; then - LAN="eth0" -else - LAN="wlan0" -fi -IP=$( ip -f inet addr show ${LAN} | grep -Po 'inet \K[\d.]+' ) - -mkdir ${TEMPERATURE_HOME} -p - -nohup java -Xmx512m -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=${IP} -cp target/scala-2.12/temperature-machine-2.1.jar bad.robot.temperature.server.Server $@ > ${LOG_FILE} 2>&1 & - -rm -f temperature-machine.log -ln -s -F ${LOG_FILE} temperature-machine.log - -echo "$!" > temperature-machine.pid -echo "Started your temperature-machine (server-mode), monitoring $@;" -echo " Redirecting output to ${LOG_FILE}" -echo " PID stored in temperature-machine.pid" -echo " JMX enabled, discovered ${LAN} on ${IP}" \ No newline at end of file diff --git a/src/debian/bin/start.sh b/src/debian/bin/start.sh deleted file mode 100755 index 65b534b..0000000 --- a/src/debian/bin/start.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -TEMPERATURE_HOME=~/.temperature -LOG_FILE=${TEMPERATURE_HOME}/temperature-machine.log - -ETH0=`grep "eth0" /proc/net/dev` -if [ -n "$ETH0" ] ; then - LAN="eth0" -else - LAN="wlan0" -fi -IP=$( ip -f inet addr show ${LAN} | grep -Po 'inet \K[\d.]+' ) - -mkdir ${TEMPERATURE_HOME} -p - -nohup java -Xmx512m -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=${IP} -jar target/scala-2.12/temperature-machine-2.1.jar > ${LOG_FILE} 2>&1 & - -rm -f temperature-machine.log -ln -s -F ${LOG_FILE} temperature-machine.log - -echo "$!" > temperature-machine.pid -echo "Started your temperature-machine (server mode), monitoring default RRD;" -echo " Redirecting output to ${LOG_FILE}" -echo " PID stored in temperature-machine.pid" -echo " JMX enabled, discovered ${LAN} on ${IP}" \ No newline at end of file diff --git a/src/debian/bin/stop.sh b/src/debian/bin/stop.sh deleted file mode 100755 index 88c01e5..0000000 --- a/src/debian/bin/stop.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -PID_FILE=temperature-machine.pid - -if [ -f ${PID_FILE} ]; then - PID=$(cat ${PID_FILE}) - echo "Stopping temperature-machine on PID $PID" - kill ${PID} || true - rm ${PID_FILE} -else - echo "No temperature-machine running" -fi