frodovdr/raspberrymatic-addon-rmupdate
1
0
Fork 0
mirror of https://github.com/j-a-n/raspberrymatic-addon-rmupdate.git synced 2023-10-10 13:37:40 +02:00
Code Issues Releases Wiki Activity

Correct firmware version list if experimental version is installed

Browse Source
This commit is contained in:
Jan Schneider 2020-06-28 19:16:24 +02:00
parent 117be79fc4
commit 3297ef76b3
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
addon/lib/rmupdate.tcl
View File

@ -1192,18 +1192,32 @@ proc ::rmupdate::get_firmware_info {} {
write_log 1 "Failed to get latest supported version from ${support_file_url}" write_log 1 "Failed to get latest supported version from ${support_file_url}"
return "\[\]" return "\[\]"
} }
set versions [list]
set current [get_current_firmware_version] set current [get_current_firmware_version]
set versions [list $current] set experimental_version ""
foreach e [get_available_firmware_downloads] { foreach e [get_available_firmware_downloads] {
set version [get_version_from_filename $e] set version [get_version_from_filename $e]
set downloads($version) $e if {$version != "unknown"} {
if {[lsearch $versions $version] == -1} { set downloads($version) $e
if {$version != "unknown"} { if {[string first "-" $version] != -1} {
set experimental_version $version
} elseif {[lsearch $versions $version] == -1} {
lappend versions $version lappend versions $version
} }
} }
} }
if {$experimental_version != ""} {
if {[lsearch $versions $experimental_version] == -1} {
set tmp [split $experimental_version "-"]
# experimental version != latest version
lappend versions $experimental_version
if {[lindex $tmp 0] == $current} {
# assuming that experimental version is installed
set current $experimental_version
}
}
}
foreach e [get_available_firmware_images] { foreach e [get_available_firmware_images] {
set version [get_version_from_filename $e] set version [get_version_from_filename $e]
if {$version != "unknown"} { if {$version != "unknown"} {
@ -1213,6 +1227,9 @@ proc ::rmupdate::get_firmware_info {} {
} }
} }
} }
if {[lsearch $versions $current] == -1} {
lappend versions $current
}
set versions [lsort -decreasing -command compare_versions $versions] set versions [lsort -decreasing -command compare_versions $versions]
set json "\[" set json "\["