diff options
| -rwxr-xr-x | scripts/trollette.sh | 4 | ||||
| -rw-r--r-- | scripts/webcamscript | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/trollette.sh b/scripts/trollette.sh index 7d2d0fa..3786fc1 100755 --- a/scripts/trollette.sh +++ b/scripts/trollette.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash WEBPATH="../" NAME="klo" @@ -9,7 +9,7 @@ BILD=`python trollette.py` TODAY=`date` TIME=`date +"%H"` -cp $BILD ${WEBPATH}/public/img/buffer.${NAME}.webcam.jpg &> /dev/null || exit 1 +cp $BILD ${WEBPATH}/public/img/buffer.${NAME}.webcam.jpg > /dev/null 2>&1 || exit 1 cp ${WEBPATH}/public/img/buffer.${NAME}.webcam.jpg ${WEBPATH}/public/img/buffer.thumb.${NAME}.webcam.jpg diff --git a/scripts/webcamscript b/scripts/webcamscript index d967553..6bd6119 100644 --- a/scripts/webcamscript +++ b/scripts/webcamscript @@ -5,11 +5,11 @@ TODAY=`date` TIME=`date +"%H"` -wget "${URL}" $WGET_ARGS -O ${WEBPATH}/public/img/buffer.${NAME}.webcam.jpg &> /dev/null || exit 1 +wget "${URL}" $WGET_ARGS -O ${WEBPATH}/public/img/buffer.${NAME}.webcam.jpg > /dev/null 2>&1 || exit 1 cp ${WEBPATH}/public/img/buffer.${NAME}.webcam.jpg ${WEBPATH}/public/img/buffer.thumb.${NAME}.webcam.jpg mogrify -contrast-stretch 0 -resize 208x117 ${WEBPATH}/public/img/buffer.thumb.${NAME}.webcam.jpg -if [ x"${TIMESTAMP}" == x"yes" ]; then +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 else |