diff options
| author | kloschi klosch <klosch@netresearch.de> | 2012-02-02 21:56:19 +0100 |
|---|---|---|
| committer | kloschi klosch <klosch@netresearch.de> | 2012-02-02 21:56:19 +0100 |
| commit | 76f5eb72cda67da497ea4ba992778661559f26b4 (patch) | |
| tree | ee6875ff52dfb6b09df037095e254c6f8a8fc531 /scripts | |
| parent | 343edab3eb5284dd0ec236883974f16b486e6e3b (diff) | |
| parent | 002ccb53e6319619d503972c2a6bad0d4ead0c6f (diff) | |
Merge branch 'master' of sublab.org:website
Conflicts:
public/img/onewire/digitemp.jpg
template/news/2011-12-07-frieren.html
template/pages/projekte/content.html
template/pages/verein/content.html
template/pages/vokue/content.html
template/template/template.html
template/topic/topic
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/pingscript | 2 | ||||
| -rwxr-xr-x | scripts/temperaturescript.sh | 20 | ||||
| -rw-r--r-- | scripts/webcamscript | 2 |
3 files changed, 22 insertions, 2 deletions
diff --git a/scripts/pingscript b/scripts/pingscript index 55e0b65..bfdbbc7 100755 --- a/scripts/pingscript +++ b/scripts/pingscript @@ -22,7 +22,7 @@ insertstatus() { apistatus() { [ -d "${WEBPATH}/public/api" ] || mkdir -p "${WEBPATH}/public/api" if [ "`cat \"${WEBPATH}/public/api/status\" 2>/dev/null`" != "$1" ]; then - wget -q http://127.0.0.1:8042/send "--post-data=message=sublab status is now: $1" + wget -q http://127.0.0.1:8042/send -O /dev/null "--post-data=message=sublab status is now: $1" fi echo $1 > "${WEBPATH}/public/api/status" } diff --git a/scripts/temperaturescript.sh b/scripts/temperaturescript.sh new file mode 100755 index 0000000..df13b38 --- /dev/null +++ b/scripts/temperaturescript.sh @@ -0,0 +1,20 @@ +#!/bin/bash +#script to fetch latest temperature graph and resize it. + + +URL="http://taifun.local.sublab.org/temperature/temp-2hour.png" +WEBPATH=../ + +wget ${URL} -O ${WEBPATH}/public/img/buffer.tempgraph.png &> /dev/null || exit 1 + +cp ${WEBPATH}/public/img/buffer.tempgraph.png ${WEBPATH}/public/img/buffer.thumb.tempgraph.png + +mogrify -crop 800x400+70+41 -contrast-stretch 0 -resize 200x50 -contrast-stretch 0 ${WEBPATH}/public/img/buffer.thumb.tempgraph.png + +mv -f ${WEBPATH}/public/img/buffer.tempgraph.png ${WEBPATH}/public/img/tempgraph.png &> /dev/null + +mv -f ${WEBPATH}/public/img/buffer.thumb.tempgraph.png ${WEBPATH}/public/img/thumb.tempgraph.png &> /dev/null + + + + diff --git a/scripts/webcamscript b/scripts/webcamscript index 883ef79..4e83c9a 100644 --- a/scripts/webcamscript +++ b/scripts/webcamscript @@ -8,7 +8,7 @@ TIME=`date +"%H"` wget "${URL}" $WGET_ARGS -O ${WEBPATH}/public/img/buffer.${NAME}.webcam.jpg &> /dev/null || exit 1 cp ${WEBPATH}/public/img/buffer.${NAME}.webcam.jpg ${WEBPATH}/public/img/buffer.thumb.${NAME}.webcam.jpg -mogrify -resize 200x150 ${WEBPATH}/public/img/buffer.thumb.${NAME}.webcam.jpg +mogrify -contrast-stretch 0 -resize 200x150 ${WEBPATH}/public/img/buffer.thumb.${NAME}.webcam.jpg if [ x"${TIMESTAMP}" == x"yes" ]; then if [ $TIME -lt 6 ] || [ $TIME -ge 18 ]; then mogrify -contrast-stretch 0 -adaptive-sharpen 3 -fill white -gravity SouthEast -draw "text 10,10 '${TODAY}'" ${WEBPATH}/public/img/buffer.${NAME}.webcam.jpg |