meta-openpower: fix shellcheck issues
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I35a9ffed937919467dec62a1fbff729f4a51366c
diff --git a/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh b/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh
index 63a4ad7..8e00eb1 100755
--- a/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh
+++ b/meta-openpower/recipes-phosphor/network/first-boot-set-mac/first-boot-set-mac.sh
@@ -22,9 +22,9 @@
${MAPPER_IFACE} \
GetSubTree sias \
${INVENTORY_PATH} 0 1 ${NETWORK_ITEM_IFACE} \
- 2>/dev/null | grep ${INVENTORY_PATH} | wc -l || true)
+ 2>/dev/null | grep -c ${INVENTORY_PATH} || true)
- if [ $NETWORK_ITEM_PATH_COUNT -gt 1 ]; then
+ if [ "$NETWORK_ITEM_PATH_COUNT" -gt 1 ]; then
# If there are more than 2 NETOWRK ITEM and path must contain $1
# for finding the right NETWORK ITEM
NETWORK_ITEM_PATH=$(busctl --no-pager --verbose call \
@@ -33,7 +33,7 @@
${MAPPER_IFACE} \
GetSubTree sias \
${INVENTORY_PATH} 0 1 ${NETWORK_ITEM_IFACE} \
- 2>/dev/null | grep ${INVENTORY_PATH} | grep $1 || true)
+ 2>/dev/null | grep ${INVENTORY_PATH} | grep "$1" || true)
else
NETWORK_ITEM_PATH=$(busctl --no-pager --verbose call \
${MAPPER_IFACE} \
@@ -49,26 +49,26 @@
NETWORK_ITEM_PATH=${NETWORK_ITEM_PATH%\"*}
NETWORK_ITEM_SERVICE=$(mapper get-service \
- ${NETWORK_ITEM_PATH} 2>/dev/null || true)
+ "${NETWORK_ITEM_PATH}" 2>/dev/null || true)
- if [[ -z "${NETWORK_ITEM_SERVICE}" ]]; then
+ if [ -z "${NETWORK_ITEM_SERVICE}" ]; then
show_error 'No Ethernet interface found in the Inventory. Is VPD EEPROM empty?'
return
fi
- MAC_ADDR=$(busctl get-property ${NETWORK_ITEM_SERVICE} \
- ${NETWORK_ITEM_PATH} \
- ${NETWORK_ITEM_IFACE} MACAddress)
+ MAC_ADDR=$(busctl get-property "${NETWORK_ITEM_SERVICE}" \
+ "${NETWORK_ITEM_PATH}" \
+ "${NETWORK_ITEM_IFACE}" MACAddress)
# 's "54:52:01:02:03:04"'
MAC_ADDR=${MAC_ADDR#*\"}
MAC_ADDR=${MAC_ADDR%\"*}
- if [[ -n "${MAC_ADDR}" ]]; then
+ if [ -n "${MAC_ADDR}" ]; then
busctl set-property xyz.openbmc_project.Network \
- /xyz/openbmc_project/network/$1 \
+ "/xyz/openbmc_project/network/$1" \
xyz.openbmc_project.Network.MACAddress \
- MACAddress s ${MAC_ADDR}
+ MACAddress s "${MAC_ADDR}"
fi
}
@@ -77,7 +77,7 @@
exit 1
fi
-sync_mac $1
+sync_mac "$1"
# Prevent start at next boot time
mkdir -p "/var/lib/first-boot-set-mac"