commit 67b60411407c6d7dc39332cb53ca57d83ceb6116 parent 39fde5634d7ad4a0b813312b44a61f92dd5aad81 Author: Dominik Schmidt <das1993@hotmail.com> Date: Fri, 29 Jun 2018 00:49:46 +0000 Rename laundrysorcery_cluster.sh to laundrysorcery_cluster Diffstat:
| Makefile | | | 4 | ++-- |
| dist/cron.daily/laundrysorcery_cluster.in | | | 6 | ++++++ |
| dist/cron_daily/laundrysorcery_cluster.sh.in | | | 6 | ------ |
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile @@ -26,10 +26,10 @@ src/laundrysorcery: src/laundrysorcery.c plot.png: rrdtool graph -s -300s $@ DEF:mylight=database.rrd:light:AVERAGE:step=1 LINE2:mylight#ff0000 -install: src/laundrysorcery src/laundryclustery dist/systemd/LaundrySorcery.service dist/cron_daily/laundrysorcery_cluster.sh +install: src/laundrysorcery src/laundryclustery dist/systemd/LaundrySorcery.service dist/cron.daily/laundrysorcery_cluster install -s -m 755 src/laundrysorcery $(DESTDIR)/bin/laundrysorcery install -s -m 755 src/clustering $(DESTDIR)/bin/laundryclustery install -m 600 dist/systemd/LaundrySorcery.service /usr/lib/systemd/system/LaundrySorcery.service - install -m 700 dist/cron_daily/laundrysorcery_cluster.sh /etc/cron.daily/laundrysorcery_cluster.sh + install -m 700 dist/cron.daily/laundrysorcery_cluster /etc/cron.daily/laundrysorcery_cluster install -m 755 $(wildcard www/index.sh www/light_*.sh www/print_delta_t.sh) -t $(WWWDIR) install -m 644 www/generate_image.sh www/delta_t.sh -t $(WWWDIR) diff --git a/dist/cron.daily/laundrysorcery_cluster.in b/dist/cron.daily/laundrysorcery_cluster.in @@ -0,0 +1,6 @@ +#!/bin/bash + +LOG_FILE="/var/log/laundrysorcery.log" +CLUSTER_FILE="WWWDIR/clusters" + +sed '1d;$!b;/ /!d' "${LOG_FILE}" | /usr/local/bin/laundryclustery - > "${CLUSTER_FILE}" diff --git a/dist/cron_daily/laundrysorcery_cluster.sh.in b/dist/cron_daily/laundrysorcery_cluster.sh.in @@ -1,6 +0,0 @@ -#!/bin/bash - -LOG_FILE="/var/log/laundrysorcery.log" -CLUSTER_FILE="WWWDIR/clusters" - -sed '1d;$!b;/ /!d' "${LOG_FILE}" | /usr/local/bin/laundryclustery - > "${CLUSTER_FILE}"