diff --git a/data/y-web/Y_About_Image.yhtm b/data/y-web/Y_About_Image.yhtm index 9abca4e0a..870a8a108 100644 --- a/data/y-web/Y_About_Image.yhtm +++ b/data/y-web/Y_About_Image.yhtm @@ -90,11 +90,12 @@ function getBuild(_version) function get_update_txt() { //show_waitbox(true); - loadSyncURL("/control/exec?Y_Tools&get_update_txt"); + loadSyncURL("/control/exec?Y_Tools&get_update_txt&{=func:get_revision=}&\"{=func:get_boxname=}\"&{=func:get_chip_type=}&nightly"); window.document.location.href="/Y_About_Image.yhtm?ani=false"; } -jQuery(document).ready(function(){ +jQuery(document).ready(function() +{ if ("{=ani=}" == "false") { jQuery('#_root_used_graph').css({ width: "{=var-get:_root_used_percent=}%"}); @@ -107,6 +108,8 @@ jQuery(document).ready(function(){ jQuery('#_var_used_graph').delay(750).animate({ width: "{=var-get:_var_used_percent=}%"}, 750); jQuery('#_mem_used_graph').delay(750).animate({ width: "{=var-get:_mem_used_percent=}%"}, 750); } + + loadSyncURL("/control/exec?Y_Tools&rm_update_txt"); }); {=include-block:Y_Blocks.txt;head_close=} @@ -149,7 +152,6 @@ jQuery(document).ready(function(){ {=ini-get:/.version;creator=}
- @@ -269,8 +268,5 @@ jQuery(document).ready(function(){ - diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt index f006ad169..d893d4e6d 100644 --- a/data/y-web/Y_Version.txt +++ b/data/y-web/Y_Version.txt @@ -1,3 +1,3 @@ -version=3.1.2 -date=12.03.2023 +version=3.1.3 +date=17.03.2023 info=NI-Neutrino-Webinterface diff --git a/data/y-web/scripts/Y_Tools.sh b/data/y-web/scripts/Y_Tools.sh index ff4525d99..949426a22 100644 --- a/data/y-web/scripts/Y_Tools.sh +++ b/data/y-web/scripts/Y_Tools.sh @@ -687,11 +687,14 @@ case "$action" in ;; get_update_txt) version="n/a" - #FIXME align url to box specs - wget -O /tmp/release.txt "http://neutrino-images.de/neutrino-images/update.php" - test -e /tmp/release.txt && version=$(cat /tmp/release.txt | grep ".img" | cut -d" " -f2) + revision=$1 + boxname=${2// /%20} + chip_type=$3 + image_type=$4 + wget -O /tmp/${image_type}.txt "https://neutrino-images.de/neutrino-images/update.php?revision=$revision&boxname=$boxname&chip_type=$chip_type&image_type=$image_type" + test -e /tmp/${image_type}.txt && version=$(cat /tmp/${image_type}.txt | cut -d" " -f2) echo "version=${version// /}" > /tmp/update.txt - rm -f /tmp/release.txt + rm -f /tmp/${image_type}.txt ;; rm_update_txt) rm -f /tmp/update.txt