[gentoo-commits] proj/netifrc:master commit in: init.d/

["Robin H. Johnson" <robbat2@gentoo.org>]

commit:     c78662eeafaf5f9254f62ae1f40f7c058180af8a
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 05:24:46 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 05:33:35 2019 +0000
URL:        https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=c78662ee

init.d/net.lo.in: shellcheck: _load_modules

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 init.d/net.lo.in | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index a958598..c8af39f 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -430,13 +430,13 @@ _load_modules()
 	fi
 
 	MODULES=
-	if [ "${IFACE}" != "lo" -a "${IFACE}" != "lo0" ]; then
+	if [ "${IFACE}" != "lo" ] && [ "${IFACE}" != "lo0" ]; then
 		eval mymods=\$modules_${IFVAR}
 		# shellcheck disable=SC2154
 		[ -z "${mymods}" ] && mymods=${modules}
 	fi
 
-	local i=-1 x= mod= f= provides=
+	local i=-1 x='' mod='' f='' provides=''
 	while true; do
 		: $(( i += 1 ))
 		eval mod=\$module_${i}
@@ -446,7 +446,7 @@ _load_modules()
 		eval set -- \$module_${i}_program
 		if [ -n "$1" ]; then
 			if ! _program_available "$@" >/dev/null; then
-				vewarn "Skipping module $mod due to missing program: $@"
+				vewarn "Skipping module $mod due to missing program: $*"
 				continue
 			fi
 		fi
@@ -457,7 +457,7 @@ _load_modules()
 		fi
 		if [ -n "$1" ]; then
 			if ! _program_available "$@" >/dev/null; then
-				vewarn "Skipping module $mod due to missing program: $@"
+				vewarn "Skipping module $mod due to missing program: $*"
 				continue
 			fi
 		fi
@@ -483,7 +483,8 @@ _load_modules()
 		# Wrap our provides
 		local f=
 		for f in pre_start start post_start; do
-			eval "${provides}_${f}() { [ "$(command -v "${mod}_${f}")" = "${mod}_${f}" ] || return 0; ${mod}_${f} \"\$@\"; }"
+			inner=$(command -v "${mod}_${f}")
+			eval "${provides}_${f}() { [ '${inner}' = '${mod}_${f}' ] || return 0; ${mod}_${f} \"\$@\"; }"
 		done
 
 		eval module_${mod}_provides="${provides}"
@@ -497,7 +498,8 @@ _load_modules()
 			eval x=\$module_${mod}_provides
 			[ -z "${x}" ] && continue
 			for f in pre_start start post_start; do
-				eval "${x}_${f}() { [ "$(command -v "${mod}_${f}")" = "${mod}_${f}" ] || return 0; ${mod}_${f} \"\$@\"; }"
+				inner=$(command -v "${mod}_${f}")
+				eval "${x}_${f}() { [ '${inner}' = '${mod}_${f}' ] || return 0; ${mod}_${f} \"\$@\"; }"
 			done
 			eval module_${x}_providedby="${mod}"
 			;;