raspberrypi/rpi-eeprom
1
0
Fork 0
mirror of https://github.com/raspberrypi/rpi-eeprom.git synced 2026-01-21 05:35:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

handle undefined machine output consistently

Browse Source
This commit is contained in:
MilhouseVH
2019-10-22 20:56:28 +01:00
parent 269f5605f1
commit b8b7082abf
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rpi-eeprom-update
View File

@@ -469,8 +469,8 @@ write_status_info()
[ -z "${MACHINE_OUTPUT}" ] && return 0 [ -z "${MACHINE_OUTPUT}" ] && return 0
exit_code="${1:-EXIT_FAILED}" exit_code="${1:-EXIT_FAILED}"
bootloader_cur="${BOOTLOADER_CURRENT_VERSION}" bootloader_cur="${BOOTLOADER_CURRENT_VERSION:-0}"
bootloader_new="${BOOTLOADER_UPDATE_VERSION}" bootloader_new="${BOOTLOADER_UPDATE_VERSION:-0}"
vl805_cur="${VL805_CURRENT_VERSION}" vl805_cur="${VL805_CURRENT_VERSION}"
vl805_new="${VL805_UPDATE_VERSION}" vl805_new="${VL805_UPDATE_VERSION}"
@@ -486,8 +486,8 @@ EOF
cat > "${MACHINE_OUTPUT}" <<EOF cat > "${MACHINE_OUTPUT}" <<EOF
{ {
"EXITCODE": "${exit_code}", "EXITCODE": "${exit_code}",
"BOOTLOADER_CURRENT": ${bootloader_cur:-0}, "BOOTLOADER_CURRENT": ${bootloader_cur},
"BOOTLOADER_LATEST": ${bootloader_new:-0}, "BOOTLOADER_LATEST": ${bootloader_new},
"VL805_CURRENT": "${vl805_cur}", "VL805_CURRENT": "${vl805_cur}",
"VL805_LATEST": "${vl805_new}" "VL805_LATEST": "${vl805_new}"
} }