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

redirect unzip stderr output to /dev/null otherwise tcl exec command will throw an error

Browse Source
This commit is contained in:
Jan Schneider 2017-10-24 08:20:28 +02:00
parent 2b9ba9dbf8
commit 2b80410aaf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addon/lib/rmupdate.tcl
View File

@ -463,7 +463,7 @@ proc ::rmupdate::download_firmware {version} {
write_log "Download completed." write_log "Download completed."
write_log "Extracting firmware ${archive_file}." write_log "Extracting firmware ${archive_file}."
set data [exec /usr/bin/unzip -ql "${archive_file}"] set data [exec /usr/bin/unzip -ql "${archive_file}" 2>/dev/null]
set img_file "" set img_file ""
foreach d [split $data "\n"] { foreach d [split $data "\n"] {
regexp {\s+(\S+\.img)\s*$} $d match img_file regexp {\s+(\S+\.img)\s*$} $d match img_file
@ -474,7 +474,7 @@ proc ::rmupdate::download_firmware {version} {
if { $img_file == "" } { if { $img_file == "" } {
error "Failed to extract image from archive." error "Failed to extract image from archive."
} }
exec /usr/bin/unzip "${archive_file}" "${img_file}" -o -d "${img_dir}" exec /usr/bin/unzip "${archive_file}" "${img_file}" -o -d "${img_dir}" 2>/dev/null
set img_file "${img_dir}/${img_file}" set img_file "${img_dir}/${img_file}"
puts "${img_file} ${image_file}" puts "${img_file} ${image_file}"
if {$img_file != $image_file} { if {$img_file != $image_file} {