| 1 |
commit: ad3e0e73f5f9fbc8481dbee4f77fa8001ca78844 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Apr 21 05:23:19 2019 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Apr 21 05:33:27 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=ad3e0e73 |
| 7 |
|
| 8 |
init.d/net.lo.in: shellcheck: _gen_module_list() |
| 9 |
|
| 10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 11 |
|
| 12 |
init.d/net.lo.in | 24 ++++++++++++------------ |
| 13 |
1 file changed, 12 insertions(+), 12 deletions(-) |
| 14 |
|
| 15 |
diff --git a/init.d/net.lo.in b/init.d/net.lo.in |
| 16 |
index 77f0d8f..961d9fa 100644 |
| 17 |
--- a/init.d/net.lo.in |
| 18 |
+++ b/init.d/net.lo.in |
| 19 |
@@ -300,11 +300,11 @@ _get_errorhandler_behavior() { |
| 20 |
# Basically sorts our modules into order and saves the list |
| 21 |
_gen_module_list() |
| 22 |
{ |
| 23 |
- local x= f= force=$1 |
| 24 |
+ local x='' f='' force="$1" |
| 25 |
if ! ${force} ; then |
| 26 |
- if [ -s "${MODULESLIST}" -a "${MODULESLIST}" -nt /proc/$$/status ]; then |
| 27 |
+ if [ -s "${MODULESLIST}" ] && [ "${MODULESLIST}" -nt /proc/$$/status ]; then |
| 28 |
ewarn "Discarding cached module list ($MODULESLIST) as it's newer current time!" |
| 29 |
- elif [ -s "${MODULESLIST}" -a "${MODULESLIST}" -nt "${MODULESDIR}" ]; then |
| 30 |
+ elif [ -s "${MODULESLIST}" ] && [ "${MODULESLIST}" -nt "${MODULESDIR}" ]; then |
| 31 |
local update=false |
| 32 |
for x in "${MODULESDIR}"/*.sh; do |
| 33 |
[ -e "${x}" ] || continue |
| 34 |
@@ -333,7 +333,7 @@ _gen_module_list() |
| 35 |
} |
| 36 |
|
| 37 |
program() { |
| 38 |
- if [ "$1" = "start" -o "$1" = "stop" ]; then |
| 39 |
+ if [ "$1" = "start" ] || [ "$1" = "stop" ]; then |
| 40 |
local s="$1" |
| 41 |
shift |
| 42 |
eval ${MODULE}_program_${s}="\"\${${MODULE}_program_${s}}\${${MODULE}_program_${s}:+ }$*\"" |
| 43 |
@@ -345,7 +345,7 @@ _gen_module_list() |
| 44 |
provide() { |
| 45 |
eval ${MODULE}_provide="\"\${${MODULE}_provide}\${${MODULE}_provide:+ }$*\"" |
| 46 |
local x |
| 47 |
- for x in $*; do |
| 48 |
+ for x in "$@"; do |
| 49 |
eval ${x}_providedby="\"\${${MODULE}_providedby}\${${MODULE}_providedby:+ }${MODULE}\"" |
| 50 |
done |
| 51 |
} |
| 52 |
@@ -356,7 +356,7 @@ _gen_module_list() |
| 53 |
. "${MODULE}" || continue |
| 54 |
MODULE=${MODULE#${MODULESDIR}/} |
| 55 |
MODULE=${MODULE%.sh} |
| 56 |
- eval ${MODULE}_depend |
| 57 |
+ eval "${MODULE}_depend" |
| 58 |
MODULES="${MODULES} ${MODULE}" |
| 59 |
done |
| 60 |
|
| 61 |
@@ -402,13 +402,13 @@ _gen_module_list() |
| 62 |
eval PROGRAM_START=\$${MODULE}_program_start |
| 63 |
eval PROGRAM_STOP=\$${MODULE}_program_stop |
| 64 |
eval PROVIDE=\$${MODULE}_provide |
| 65 |
- echo "module_${i}='${MODULE}'" >> "${TMPMODULESLIST}" |
| 66 |
- echo "module_${i}_program='${PROGRAM}'" >> "${TMPMODULESLIST}" |
| 67 |
- echo "module_${i}_program_start='${PROGRAM_START}'" >> "${TMPMODULESLIST}" |
| 68 |
- echo "module_${i}_program_stop='${PROGRAM_STOP}'" >> "${TMPMODULESLIST}" |
| 69 |
- echo "module_${i}_provide='${PROVIDE}'" >> "${TMPMODULESLIST}" |
| 70 |
+ echo "module_${i}='${MODULE}'" |
| 71 |
+ echo "module_${i}_program='${PROGRAM}'" |
| 72 |
+ echo "module_${i}_program_start='${PROGRAM_START}'" |
| 73 |
+ echo "module_${i}_program_stop='${PROGRAM_STOP}'" |
| 74 |
+ echo "module_${i}_provide='${PROVIDE}'" |
| 75 |
: $(( i += 1 )) |
| 76 |
- done |
| 77 |
+ done >> "${TMPMODULESLIST}" |
| 78 |
echo "module_${i}=" >> "${TMPMODULESLIST}" |
| 79 |
mv -f "${TMPMODULESLIST}" "${MODULESLIST}" |
| 80 |
) |
Archives