commit e455a998b2c984da37ff39c694fa72ef6e5a7ef0 parent d292a21ad67f67adc293c13bd3988f79c46a3119 Author: Dominik Schmidt <das1993@hotmail.com> Date: Wed, 6 Jun 2018 16:51:10 +0000 Merge 192.168.1.98:LaundrySorcery Diffstat:
| Makefile | | | 5 | +++-- |
| www/index.sh | | | 5 | +++-- |
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile @@ -18,5 +18,6 @@ plot.png: install: src/laundrysorcery $(WWWDIR)/database.rrd install -s -m 755 src/laundrysorcery $(DESTDIR)/bin/laundrysorcery - install -m 600 dist/systemd/LaundrySorcery.service /var/lib/systemd/system/LaundrySorcery.service - install -m 755 $(wildcard www/index.sh www/plot_*.sh) -t $(WWWDIR) + install -m 600 dist/systemd/LaundrySorcery.service /usr/lib/systemd/system/LaundrySorcery.service + install -m 755 $(wildcard www/index.sh www/light_*.sh) -t $(WWWDIR) + install -m 644 www/generate_image.sh -t $(WWWDIR) diff --git a/www/index.sh b/www/index.sh @@ -5,8 +5,8 @@ declare DTIME declare ON ON=false -OTIME=`<on_time` -if [[ $OTIME -lt 0 ]] +OTIME=`<on_file` +if [[ $OTIME -ge 0 ]] then ON=true TIME=`date +%s` @@ -60,6 +60,7 @@ Content-Type: text/html rawFile.send(null); } function timeSince(delta_t) { + var seconds = delta_t; var interval = Math.floor(delta_t / 31536000); if (interval > 1) { return interval + " years";