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

rpi-eeprom-update: Fix shellcheck warnings

Browse Source
This commit is contained in:
Tim Gover
2020-10-18 15:17:33 +01:00
parent 718820bceb
commit 2730572da2
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

@@ -104,7 +104,7 @@ die() {
prepareImage() prepareImage()
{ {
[ -f "${BOOTLOADER_UPDATE_IMAGE}" ] || die "EEPROM image \'${BOOTLOADER_UPDATE_IMAGE}\' not found" [ -f "${BOOTLOADER_UPDATE_IMAGE}" ] || die "EEPROM image '${BOOTLOADER_UPDATE_IMAGE}' not found"
TMP_EEPROM_IMAGE="$(mktemp)" TMP_EEPROM_IMAGE="$(mktemp)"
TMP_EEPROM_CONFIG="$(mktemp)" TMP_EEPROM_CONFIG="$(mktemp)"
NEW_EEPROM_CONFIG="$(mktemp)" NEW_EEPROM_CONFIG="$(mktemp)"
@@ -180,7 +180,7 @@ applyRecoveryUpdate()
|| die "Failed to create ${BOOTFS}/vl805.sig" || die "Failed to create ${BOOTFS}/vl805.sig"
cp -f "${VL805_UPDATE_IMAGE}" "${BOOTFS}/vl805.bin" \ cp -f "${VL805_UPDATE_IMAGE}" "${BOOTFS}/vl805.bin" \
|| die "Failed to copy ${VL805_UPDATE_IMAGE} to ${BOOTFS/vl805.bin}" || die "Failed to copy ${VL805_UPDATE_IMAGE} to ${BOOTFS}/vl805.bin"
# For NFS mounts ensure that the files are readable to the TFTP user # For NFS mounts ensure that the files are readable to the TFTP user
chmod -f go+r "${BOOTFS}/vl805.bin" "${BOOTFS}/vl805.sig" \ chmod -f go+r "${BOOTFS}/vl805.bin" "${BOOTFS}/vl805.sig" \
@@ -205,7 +205,7 @@ applyUpdate() {
fi fi
CHECKSUMS=$(mktemp) CHECKSUMS=$(mktemp)
cat "${package_checksums_file}" | grep -E '\.bin$' > "${CHECKSUMS}" grep -E '\.bin$' "${package_checksums_file}" > "${CHECKSUMS}"
cd / cd /
if ! md5sum -c "${CHECKSUMS}" > /dev/null 2>&1; then if ! md5sum -c "${CHECKSUMS}" > /dev/null 2>&1; then
md5sum -c "${CHECKSUMS}" md5sum -c "${CHECKSUMS}"
@@ -304,7 +304,7 @@ checkDependencies() {
BOARD_TYPE=$(((0x$BOARD_INFO >> 4) & 0xff)) BOARD_TYPE=$(((0x$BOARD_INFO >> 4) & 0xff))
BOARD_REVISION=$((0x$BOARD_INFO & 0xf)) BOARD_REVISION=$((0x$BOARD_INFO & 0xf))
if [ ${BOARD_TYPE} -eq 20 ] && [ ${CM4_ENABLE_RPI_EEPROM_UPDATE} != '1' ]; then if [ ${BOARD_TYPE} -eq 20 ] && [ "${CM4_ENABLE_RPI_EEPROM_UPDATE}" != '1' ]; then
# For CM4, USB device boot is the recommended method for EEPROM updates. # For CM4, USB device boot is the recommended method for EEPROM updates.
echo "rpi-eeprom-update is not enabled by default on CM4" echo "rpi-eeprom-update is not enabled by default on CM4"
exit ${EXIT_SUCCESS} exit ${EXIT_SUCCESS}
@@ -722,9 +722,9 @@ while getopts A:abdhilf:m:ju:r option; do
a) AUTO_UPDATE_BOOTLOADER=1 a) AUTO_UPDATE_BOOTLOADER=1
AUTO_UPDATE_VL805=1 AUTO_UPDATE_VL805=1
;; ;;
b) b)
findBootFS findBootFS
echo ${BOOTFS} echo "${BOOTFS}"
exit 0 exit 0
;; ;;
d) OVERWRITE_CONFIG=1 d) OVERWRITE_CONFIG=1