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/webcamscript | |
| 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/webcamscript')
| -rw-r--r-- | scripts/webcamscript | 2 |
1 files changed, 1 insertions, 1 deletions
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 |