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

Merge pull request #36 from MilhouseVH/fix_exit_code

Browse Source 
Restore machine output exit code as string
This commit is contained in:
timg
2019-10-23 11:39:17 +01:00
committed by GitHub
parent 608098e912 b8b7082abf
commit 63c6c210c0
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rpi-eeprom-update
View File

@@ -454,12 +454,12 @@ checkVersion()
if [ "${BOOTLOADER_UPDATE_VERSION}" -gt "${BOOTLOADER_CURRENT_VERSION}" ]; then if [ "${BOOTLOADER_UPDATE_VERSION}" -gt "${BOOTLOADER_CURRENT_VERSION}" ]; then
echo "*** UPDATE REQUIRED ***" echo "*** UPDATE REQUIRED ***"
printVersions printVersions
write_status_info "${EXIT_UPDATE_REQUIRED}" write_status_info "EXIT_UPDATE_REQUIRED"
exit ${EXIT_UPDATE_REQUIRED} exit ${EXIT_UPDATE_REQUIRED}
else else
echo "Bootloader EEPROM is up to date" echo "Bootloader EEPROM is up to date"
printVersions printVersions
write_status_info "${EXIT_SUCCESS}" write_status_info "EXIT_SUCCESS"
exit ${EXIT_SUCCESS} exit ${EXIT_SUCCESS}
fi fi
} }
@@ -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}"
@@ -485,9 +485,9 @@ EOF
else else
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}"
} }