Merge pull request #218 from mackyle/master

timg236 · web-flow · commit 65037b76bfd0 · 2020-09-03T20:20:01.000+01:00
rpi-eeprom-update: avoid any possible od accidents
diff --git a/rpi-eeprom-update b/rpi-eeprom-update
@@ -268,7 +268,7 @@ getBootloaderUpdateVersion() {
 }
 
 checkDependencies() {
-   BOARD_INFO="$(od -An -t x1 /sys/firmware/devicetree/base/system/linux,revision | tr -d ' ')"
+   BOARD_INFO="$(od -v -An -t x1 /sys/firmware/devicetree/base/system/linux,revision | tr -d ' \n')"
    if [ $(((0x$BOARD_INFO >> 23) & 1)) -ne 0 ] && [ $(((0x$BOARD_INFO >> 12) & 15)) -eq 3 ]; then
       echo "BCM2711 detected"
    else

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ getBootloaderUpdateVersion() {`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`checkDependencies() {`
`271`		`- BOARD_INFO="$(od -An -t x1 /sys/firmware/devicetree/base/system/linux,revision \| tr -d ' ')"`
	`271`	`+ BOARD_INFO="$(od -v -An -t x1 /sys/firmware/devicetree/base/system/linux,revision \| tr -d ' \n')"`
`272`	`272`	`if [ $(((0x$BOARD_INFO >> 23) & 1)) -ne 0 ] && [ $(((0x$BOARD_INFO >> 12) & 15)) -eq 3 ]; then`
`273`	`273`	`echo "BCM2711 detected"`
`274`	`274`	`else`