Shellcheck applied - renumbered adam_multiple (with no changes :P)

Author: CoMPaTech

userdata/renumber.sh

@@ -5,36 +5,36 @@ if [ ! $# -eq 1 ]; then
 	exit 1
 fi
 
-if [ ! -d ./$1 ]; then
-	echo "Directory $1 not found, bailing out"
+if [ ! -d "./${1}" ]; then
+	echo "Directory ${1} not found, bailing out"
 	exit 2
 fi
 
-domain_objects="./$1/core.domain_objects.xml"
+domain_objects="./${1}/core.domain_objects.xml"
 
-if [ ! -f ${domain_objects} ]; then
-	echo "Directory $1 has no domain_objects, unable to continue"
+if [ ! -f "${domain_objects}" ]; then
+	echo "Directory ${1} has no domain_objects, unable to continue"
 	exit 3
 fi
 
-modules="./$1/core.modules.xml"
-if [ ! -f ${modules} ]; then
+modules="./${1}/core.modules.xml"
+if [ ! -f "${modules}" ]; then
 	echo "Directory has no modules, only changing domain_objects"
 	modules=""
 fi
 
-if [ ! $(grep "0123456789AB" ${domain_objects} | wc -l) -gt 0 ]; then
+if [ ! "$(grep -c "0123456789AB" "${domain_objects}")" -gt 0 ]; then
 	echo "File domain_objects, has no unnumbered mac-placeholders, bailing out"
 	exit 4
 fi
 
-if [ $(grep -E "012345670[A01]" ${domain_objects} | wc -l) -gt 0 ]; then
+if [ "$(grep -c -E "012345670[A01]" "${domain_objects}")" -gt 0 ]; then
 	echo "File domain_objects, already has numbered mac-placeholders, bailing out"
 	echo ""
 	echo "Checking for strays out of curtasy"
-	if [ $(grep -EB1 "0123456789AB" ${domain_objects} ${modules} | wc -l) -gt 1 ]; then
+	if [ "$(grep -c -EB1 "0123456789AB" "${domain_objects}" "${modules}")" -gt 1 ]; then
 		echo "Strays detected: (dumping found items)"
-		grep -EB1 "0123456789AB" ${domain_objects} ${modules}
+		grep -EB1 "0123456789AB" "${domain_objects}" "${modules}"
 	fi
 
 
@@ -45,26 +45,26 @@ fi
 mac_coord="012345670101"
 mac_node_pre="012345670A"
 mac_lan="012345670001"
-mac_wlan="012345670002"
+#mac_wlan="012345670002"
 
 # Scan domain_objects for mapping
 echo ""
 echo "Searching for Zigbee coordinator:"
-coord=$(grep -EB1 "0123456789AB" ${domain_objects} | grep -E "<zig_bee_coord" | cut -f 2 -d "'")
-coordcount=$(echo ${coord} | wc -l)
+coord=$(grep -EB1 "0123456789AB" "${domain_objects}" | grep -E "<zig_bee_coord" | cut -f 2 -d "'")
+coordcount=$(echo "${coord}" | wc -l)
 
-if [ ${coordcount} -gt 1 ]; then
+if [ "${coordcount}" -gt 1 ]; then
 	echo "More than 1 coordinator node found, bailing out"
 	exit 99
 fi
 echo " - Found coordinator at ${coord}"
 
 echo ""
 echo "Searching for Zigbee nodes:"
-nodes=$(grep -EB1 "0123456789AB" ${domain_objects} | grep -E "<zig_bee_node" | cut -f 2 -d "'")
+nodes=$(grep -EB1 "0123456789AB" "${domain_objects}" | grep -E "<zig_bee_node" | cut -f 2 -d "'")
 nodecount=$(echo "${nodes}" | wc -l)
 
-if [ ${nodecount} -gt 98 ]; then
+if [ "${nodecount}" -gt 98 ]; then
 	echo "More than 98 nodes found, bailing out (not handling hex-counting yet)"
 	exit 98
 fi
@@ -74,7 +74,8 @@ echo " - Found ${nodecount} nodes"
 echo ""
 echo "Changing coordinator!"
 # Coordinator change
-sed -i".bck" '/'${coord}'/{n;s#0123456789AB#'${mac_coord}'#;}' ${domain_objects} ${modules}
+# shellcheck disable=2086
+sed -i".bck" '/'${coord}'/{n;s#0123456789AB#'${mac_coord}'#;}' "${domain_objects}" "${modules}"
 
 echo ""
 echo "Changing nodes!"
@@ -86,23 +87,27 @@ for node_id in ${nodes}; do
         if [ ${counter} -lt 10 ]; then
      		counter="0${counter}"
         fi
-	sed -i".bck" '/'${node_id}'/{n;s#0123456789AB#'${mac_node_pre}${counter}'#;}' ${domain_objects} ${modules}
+	# shellcheck disable=2086
+	sed -i".bck" '/'${node_id}'/{n;s#0123456789AB#'${mac_node_pre}${counter}'#;}' "${domain_objects}" "${modules}"
 done
 
 echo ""
 echo "Checking for leftover macs (except expected gateway mac)"
-if [ $(grep "0123456789AB" ${domain_objects} | wc -l) -gt 1 ]; then
+if [ "$(grep -c "0123456789AB" "${domain_objects}" )" -gt 1 ]; then
 	echo "Unable to change gateway mac for ${domain_objects} => do this manually"
 else 
 	echo "Modifying main network address (assuming LAN)"
-	sed -i".bck" 's#0123456789AB#'${mac_lan}'#' ${domain_objects}
+	sed -i".bck" 's#0123456789AB#'${mac_lan}'#' "${domain_objects}"
 fi
 
 echo ""
 echo "Checking for strays"
-if [ $(grep -EB1 "0123456789AB" ${domain_objects} ${modules} | wc -l) -gt 1 ]; then
+domaincount=$(grep -c -EB1 "0123456789AB" "${domain_objects}")
+modulecount=$(grep -c -EB1 "0123456789AB" "${modules}")
+totalcount=$((domaincount+modulecount))
+if [ "${totalcount}" -gt 1 ]; then
 	echo "Strays detected: (dumping found items)"
-	grep -EB1 "0123456789AB" ${domain_objects} ${modules}
+	grep -EB1 "0123456789AB" "${domain_objects}" "${modules}"
 else
 	echo "All ok"
 fi