diff --git a/contrib/updatecheck/calcversions.sh b/contrib/updatecheck/calcversions.sh index fc485e24..3b0a646e 100755 --- a/contrib/updatecheck/calcversions.sh +++ b/contrib/updatecheck/calcversions.sh @@ -1,21 +1,12 @@ #!/bin/sh version=`head -n 1 ../../VERSION` revision=`git describe --always` -echo "ebusd=${version},${revision}" > versions.txt +echo "ebusd=${version},${revision}" > cdnversions.txt devver=`curl -s https://adapter.ebusd.eu/v31/firmware/ChangeLog|grep "Version "|head -n 1|sed -e 's#.*]*>##' -e 's#<.*##' -e 's# ##'` devbl=`curl -s https://adapter.ebusd.eu/v31/firmware/ChangeLog|grep "Bootloader version"|head -n 1|sed -e 's#.*]*>##' -e 's#<.*##' -e 's# ##'` -echo "device=${devver},${devbl}" >> versions.txt +echo "device=${devver},${devbl}" >> cdnversions.txt devver=`curl -s https://adapter.ebusd.eu/v5/ChangeLog|grep "Version "|head -n 1|sed -e 's#.*id="\([^"]*\)".*]*>\([^<]*\)<.*#\2,\2,\1#'` -echo "device=${devver}" >> versions.txt -cp versions.txt cdnversions.txt -files=`find config/de -type f -or -type l` -../../src/lib/ebus/test/test_filereader $files|sed -e 's#^config/de/##' -e 's#^\([^ ]*\) #\1=#' -e 's# #,#g'|sort >> versions.txt -files=`find config/en -type f -or -type l` -for filever in $(../../src/lib/ebus/test/test_filereader $files|sed -e 's#^config/en/##' -e 's#^\([^ ]*\) #\1=#' -e 's# #,#g'); do - file=${filever%%=*} - ver=${filever#*=} - sed -i -e "s#^$file=\(.*\)\$#$file=\1,$ver#" versions.txt -done +echo "device=${devver}" >> cdnversions.txt curl -sS https://ebus.github.io/en/versions.json -o veren.json curl -sS https://ebus.github.io/de/versions.json -o verde.json node -e 'fs=require("fs");e=JSON.parse(fs.readFileSync("veren.json","utf-8"));d=JSON.parse(fs.readFileSync("verde.json","utf-8"));console.log(Object.entries(d).map(([k,de])=>{en=e[k];return `${k}=${de.hash},${de.size},${de.mtime},${en.hash},${en.size},${en.mtime}`;}).join("\n"))'|sort >> cdnversions.txt