From 527fbe15d8b471264bbf579f0a9f644f8000e94b Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Wed, 29 Jun 2016 19:31:47 +0200 Subject: [PATCH] fixed functions bug on pict-converter --- www/pict-converter.sh | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/www/pict-converter.sh b/www/pict-converter.sh index 8db1b60..ed5931d 100755 --- a/www/pict-converter.sh +++ b/www/pict-converter.sh @@ -3,20 +3,6 @@ # https://trac.ffmpeg.org/wiki/Create%20a%20video%20slideshow%20from%20images # needs ffmep and exiftool -function convert { - now=$(date +"%Y-%m-%d--%T") - echo "Timelaps conversion | $now" - - pictframerate=12 - videoframerate=24 - - echo "pictframerate:$pictframerate, videoframerate=$videoframerate" - - convertVideo $pictframerate $videoframerate - exportData $pictframerate $videoframerate -} - - function convertVideo { echo 'Video conversion' pf=$1 @@ -61,6 +47,22 @@ function exportData { } + +function convert { + now=$(date +"%Y-%m-%d--%T") + echo "Timelaps conversion | $now" + + pictframerate=12 + videoframerate=24 + + echo "pictframerate:$pictframerate, videoframerate=$videoframerate" + + convertVideo $pictframerate $videoframerate + exportData $pictframerate $videoframerate +} + + + day=$(date +"%Y-%m-%d") logfile="logs/convert-$day.log" touch $logfile