From a421a12f9cc7b0d552f83c2f6fe06b14308ab614 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 25 Jul 2019 00:45:49 +0200 Subject: [PATCH] orion: replace backticks by $(...) This replaces deprecated backticks by more versatile $(...) syntax. Signed-off-by: Adrian Schmutzler [decapitalized patch subject at submitter's request] Signed-off-by: Christian Lamparter --- .../generic/base-files/etc/uci-defaults/09_hardware | 12 ++++++------ target/linux/orion/image/generic.mk | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware b/target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware index 751749d13d..5d928b092a 100644 --- a/target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware +++ b/target/linux/orion/generic/base-files/etc/uci-defaults/09_hardware @@ -30,15 +30,15 @@ commit system __EOF # add mac address from U-Boot partition to lan and wan devices - MTD=`grep -e 'u-boot' /proc/mtd` - MTD=`echo ${MTD} | sed 's/[a-z]*\([0-9]*\):.*/\1/'` + MTD=$(grep -e 'u-boot' /proc/mtd) + MTD=$(echo ${MTD} | sed 's/[a-z]*\([0-9]*\):.*/\1/') [ -n "${MTD}" ] && { - MACADDR=`dd if=/dev/mtdblock${MTD} bs=1 skip=262048 count=6 2>/dev/null | hexdump -e '1/1 "%02x"'` + MACADDR=$(dd if=/dev/mtdblock${MTD} bs=1 skip=262048 count=6 2>/dev/null | hexdump -e '1/1 "%02x"') MACADDR2=$(( 0x${MACADDR} + 1)) - MACADDR2=`printf "%012x" ${MACADDR2}` + MACADDR2=$(printf "%012x" ${MACADDR2}) - MACADDR=`echo ${MACADDR} | sed 's/\(..\)/\1:/g' | sed 's/:$//'` - MACADDR2=`echo ${MACADDR2} | sed 's/\(..\)/\1:/g' | sed 's/:$//'` + MACADDR=$(echo ${MACADDR} | sed 's/\(..\)/\1:/g' | sed 's/:$//') + MACADDR2=$(echo ${MACADDR2} | sed 's/\(..\)/\1:/g' | sed 's/:$//') uci set network.eth0.macaddr=${MACADDR} uci set network.lan.macaddr=${MACADDR} diff --git a/target/linux/orion/image/generic.mk b/target/linux/orion/image/generic.mk index 22909ac73d..595f8c1f79 100644 --- a/target/linux/orion/image/generic.mk +++ b/target/linux/orion/image/generic.mk @@ -110,7 +110,7 @@ endef define Image/Default/FileSizeCheck # parameters: 1 = file path, 2 = maximum size in bytes - [ `stat -c %s '$(1)'` -le $(2) ] || { echo ' ERROR: $(1) too big (> $(2) bytes)'; rm -f $(1); } + [ $(stat -c %s '$(1)') -le $(2) ] || { echo ' ERROR: $(1) too big (> $(2) bytes)'; rm -f $(1); } endef -- 2.30.2