nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add device version to update check

Browse Source
This commit is contained in:
John
2022-12-17 17:50:28 +01:00
parent c488156df1
commit 4c2c198842
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/updatecheck/calcversions.sh
+3
View File
@@ -3,6 +3,9 @@ version=`head -n 1 ../../VERSION`
revision=`git describe --always`
echo "ebusd=${version},${revision}" > versions.txt
echo "ebusd=${version},${revision}" > oldversions.txt
devver=`curl -s https://adapter.ebusd.eu/firmware/ChangeLog|grep "Version "|head -n 1|sed -e 's#.*<code[^>]*>##' -e 's#<.*##' -e 's# ##'`
devbl=`curl -s https://adapter.ebusd.eu/firmware/ChangeLog|grep "Bootloader "|head -n 1|sed -e 's#.*<code[^>]*>##' -e 's#<.*##' -e 's# ##'`
echo "device=${devver},${devbl}" >> versions.txt
files=`find config/ -type f -or -type l`
../../src/lib/ebus/test/test_filereader $files|sed -e 's#^config/##' -e 's#^\([^ ]*\) #\1=#' -e 's# #,#g'|sort >> versions.txt
#./oldtest_filereader $files|sed -e 's#^config/##' -e 's#^\([^ ]*\) #\1=#' -e 's# #,#g'|sort >> oldversions.txt
contrib/updatecheck/index.php
+1 -1
View File
@@ -5,7 +5,7 @@ if (substr($agent, 0, 5)==='ebusd') {
$r = @file_get_contents('php://input');
header('Content-Type: text/plain');
$r = @json_decode($r, true);
echo checkUpdate(@$r['v'], @$r['r'], @$r['a'], @$r['l']);
echo checkUpdate(@$r['v'], @$r['r'], @$r['a'], @$r['dv'], @$r['l']);
exit;
}
readVersions();
contrib/updatecheck/prepend.inc
+8 -1
View File
@@ -16,7 +16,7 @@ function readVersions($old=false) {
array_walk($v, $func);
}
}
function checkUpdate($ebusdVersion, $ebusdRelease, $architecture, $loadedFiles) {
function checkUpdate($ebusdVersion, $ebusdRelease, $architecture, $deviceVersion, $loadedFiles) {
if (!$ebusdVersion) {
return 'invalid request';
}
@@ -30,6 +30,13 @@ function checkUpdate($ebusdVersion, $ebusdRelease, $architecture, $loadedFiles)
} else {
$ret = 'version '.$versions['ebusd'][0].' available';
}
if ($deviceVersion && @$versions['device']) {
$feat = strtok($deviceVersion, '.');
$ver = strtok('.');
if ($ver && $ver!==$versions['device'][0]) {
$ret .= ', device firmware '.$versions['device'][0].' available';
}
}
$newerAvailable = 0;
$configs = '';
foreach ($loadedFiles as $k => $val) {