From 4c0b9c5f859cebfc98486a7713b69445b8669a64 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 10 May 2018 07:12:22 +0100 Subject: [PATCH] init: stop using backticks, minor cleanup --- packages/sysutils/busybox/scripts/init | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 08af4e7936..8305e09095 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -59,7 +59,7 @@ NBD_DEVS="0" FLASH_FREE_MIN="5" - INSTALLED_MEMORY=`cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2}'` + INSTALLED_MEMORY=$(cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2}') SYSTEM_TORAM_LIMIT=1024000 LIVE="no" @@ -324,7 +324,7 @@ mount_common "$NBD_DEV" "$2" "$3" "$4" - NBD_DEVS=$(( ${NBD_DEVS} + 1 )) + NBD_DEVS=$(( NBD_DEVS + 1 )) } mount_nfs() { @@ -693,7 +693,7 @@ if [ -n "$disk" ]; then if [ -n "$OVERLAY" ]; then - OVERLAY_DIR=`cat /sys/class/net/eth0/address | tr -d :` + OVERLAY_DIR=$(cat /sys/class/net/eth0/address | tr -d :) mount_part "$disk" "/storage" "rw,noatime" mkdir -p /storage/$OVERLAY_DIR @@ -798,9 +798,9 @@ check_update() { progress "Checking for updates" - UPDATE_TAR=`ls -1 "$UPDATE_DIR"/*.tar 2>/dev/null | head -n 1` - UPDATE_IMG_GZ=`ls -1 "$UPDATE_DIR"/*.img.gz 2>/dev/null | head -n 1` - UPDATE_IMG=`ls -1 "$UPDATE_DIR"/*.img 2>/dev/null | head -n 1` + UPDATE_TAR=$(ls -1 "$UPDATE_DIR"/*.tar 2>/dev/null | head -n 1) + UPDATE_IMG_GZ=$(ls -1 "$UPDATE_DIR"/*.img.gz 2>/dev/null | head -n 1) + UPDATE_IMG=$(ls -1 "$UPDATE_DIR"/*.img 2>/dev/null | head -n 1) if ! [ -f "$UPDATE_DIR/$UPDATE_KERNEL" -a -f "$UPDATE_DIR/$UPDATE_SYSTEM" ] && ! [ -f "$UPDATE_TAR" -o -f "$UPDATE_IMG_GZ" -o -f "$UPDATE_IMG" ]; then @@ -997,8 +997,8 @@ # old KERNEL+SYSTEM+free space - new KERNEL+SYSTEM must be higher than 5MB # at least 5MB free after update - TMP_SIZE=$(($OLD_KERNEL+$OLD_SYSTEM+$FLASH_FREE-$NEW_KERNEL-$NEW_SYSTEM)) - FLASH_FREE_MIN=$(($FLASH_FREE_MIN*1024*1024)) + TMP_SIZE=$((OLD_KERNEL + OLD_SYSTEM + FLASH_FREE - NEW_KERNEL - NEW_SYSTEM)) + FLASH_FREE_MIN=$((FLASH_FREE_MIN * 1024 * 1024)) if [ $TMP_SIZE -ge $FLASH_FREE_MIN ]; then echo "Checking size: OK" @@ -1118,7 +1118,7 @@ INIT_UNIT="--unit=fs-resize.target" fi - BACKUP_FILE=`ls -1 /sysroot/storage/.restore/??????????????.tar 2>/dev/null | head -n 1` + BACKUP_FILE=$(ls -1 /sysroot/storage/.restore/??????????????.tar 2>/dev/null | head -n 1) if [ -f "$BACKUP_FILE" ] ; then INIT_UNIT="--unit=backup-restore.target" fi