fff-sysupgrade: fixes shellcheck errors and warnings

Signed-off-by: Tim Niemeyer <tim@tn-x.org>
Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Tobias Klaus <tk+ff@meskal.net>
This commit is contained in:
Tim Niemeyer 2017-07-02 10:41:41 +02:00 committed by Tobias Klaus
parent 6865009d56
commit 2d3cbdf73a
1 changed files with 37 additions and 17 deletions

View File

@ -14,7 +14,8 @@ case $BOARD in
* ) * )
SOC="ar71xx" ;; SOC="ar71xx" ;;
esac esac
echo -ne "\nHardware: $BOARD\n" echo ""
echo "Hardware: $BOARD"
#rewrite BOARD #rewrite BOARD
case $BOARD in case $BOARD in
@ -36,22 +37,24 @@ esac
wget "${UPGRADE_PATH}/release.nfo" wget "${UPGRADE_PATH}/release.nfo"
if [ ! -f release.nfo ]; then if [ ! -f release.nfo ]; then
echo -ne "Latest release information not found. Please try to update manually.\n\n" echo "Latest release information not found. Please try to update manually."
echo ""
exit 1 exit 1
fi fi
VERSION=$(cat release.nfo|awk -F: '/VERSION:/ { print $2 }') VERSION=$(awk -F: '/VERSION:/ { print $2 }' release.nfo)
rm -f release.nfo rm -f release.nfo
echo -ne "Firmware found on server: $VERSION\n" echo "Firmware found on server: $VERSION"
if [ $VERSION -eq $FIRMWARE_VERSION ]; then if [ "$VERSION" -eq "$FIRMWARE_VERSION" ]; then
echo -ne "The installed firmware version is already the current version.\n\n" echo "The installed firmware version is already the current version."
echo ""
if [ "$1" = "--script" ]; then if [ "$1" = "--script" ]; then
exit 1 exit 1
fi fi
while true; do while true; do
echo -ne "Do you want to reinstall the current version? [y/N]\n" echo "Do you want to reinstall the current version? [y/N]"
read DO_UPDATE read DO_UPDATE
case $DO_UPDATE in case $DO_UPDATE in
[yY]*|[Jj]*) [yY]*|[Jj]*)
@ -67,33 +70,50 @@ if [ $VERSION -eq $FIRMWARE_VERSION ]; then
done done
fi fi
if [ "$FIRMWARE_COMMUNITY" == "franken" ]; then if [ "$FIRMWARE_COMMUNITY" = "franken" ]; then
FIRMWARE_COMMUNITY="fff" FIRMWARE_COMMUNITY="fff"
fi fi
FILE="${FIRMWARE_COMMUNITY}-${VERSION}-${SOC}-g-${BOARD}-squashfs-sysupgrade.bin" FILE="${FIRMWARE_COMMUNITY}-${VERSION}-${SOC}-g-${BOARD}-squashfs-sysupgrade.bin"
echo -ne "Downloading $FILE\n\n" echo "Downloading $FILE"
echo ""
wget "${UPGRADE_PATH}/${FILE}" wget "${UPGRADE_PATH}/${FILE}"
wget "${UPGRADE_PATH}/${FILE}.sha256" wget "${UPGRADE_PATH}/${FILE}.sha256"
echo -ne "\ndone. Comparing sha256 sums: " sum=$(sha256sum -c "${FILE}.sha256")
sha256sum -c ${FILE}.sha256
ret=$? ret=$?
echo ""
echo "done. Comparing sha256 sums: $sum"
echo echo
if [ $ret -ne 0 ]; then if [ $ret -ne 0 ]; then
echo -ne "sha256 sums do not match. Try restarting this script to redownload the firmware.\n\n" echo "sha256 sums do not match. Try restarting this script to redownload the firmware."
rm -f ${FILE}* echo ""
rm -f "${FILE}" "${FILE}.sha256"
exit 1 exit 1
else else
if [ "$1" = "--script" ]; then if [ "$1" = "--script" ]; then
echo -ne "\nStarting firmware upgrade. Don't touch me until I reboot.\n\n\n" echo ""
sysupgrade ${FILE} echo "Starting firmware upgrade. Don't touch me until I reboot."
echo ""
echo ""
sysupgrade "${FILE}"
fi fi
while true; do while true; do
read -p "sha256 sums correct. Should I start upgrading the firmware (y/N)? " yn read -p "sha256 sums correct. Should I start upgrading the firmware (y/N)? " yn
case $yn in case $yn in
[Yy]*|[Jj]*) echo -ne "\nStarting firmware upgrade. Don't touch me until I reboot.\n\n\n"; sysupgrade ${FILE}; break;; [Yy]*|[Jj]*)
*) echo -ne "\nAborting firmware upgrade.\n\n"; rm -f ${FILE}*; exit 0;; echo ""
echo "Starting firmware upgrade. Don't touch me until I reboot."
echo ""
echo ""
sysupgrade "${FILE}"
break;;
*)
echo ""
echo "Aborting firmware upgrade."
echo ""
rm -f "${FILE}" "${FILE}.sha256"
exit 0;;
esac esac
done done
fi fi