From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/netifrc:master commit in: init.d/
Date: Sun, 21 Apr 2019 05:34:03 +0000 (UTC) [thread overview]
Message-ID: <1555824820.1ae3f8e257032e753713b6582e23121984c0f9fa.robbat2@OpenRC> (raw)
commit: 1ae3f8e257032e753713b6582e23121984c0f9fa
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 05:28:15 2019 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 05:33:40 2019 +0000
URL: https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=1ae3f8e2
init.d/net.lo.in: shellcheck: start()
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
init.d/net.lo.in | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index e1a0cab..9ba2e03 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -632,9 +632,17 @@ is_interface_type()
start()
{
- local IFACE=$(get_interface) oneworked=false fallback=false module=
- local IFVAR=$(shell_var "${IFACE}") cmd= our_metric=
- local metric=0 _up_before_preup
+ local IFACE=''
+ local IFVAR=''
+ local oneworked=false
+ local fallback=false
+ local module=''
+ local cmd=''
+ local our_metric=''
+ local metric=0
+ local _up_before_preup=''
+ IFACE=$(get_interface)
+ IFVAR=$(shell_var "${IFACE}")
eval _up_before_preup="\$up_before_preup_${IFVAR}"
# shellcheck disable=SC2154
[ -z "${_up_before_preup}" ] && _up_before_preup=$up_before_preup
@@ -682,14 +690,14 @@ start()
return 1
fi
- local config= config_index=
+ local config='' config_index=''
_load_config
config_index=0
eval our_metric=\$metric_${IFVAR}
if [ -n "${our_metric}" ]; then
metric=${our_metric}
- elif [ "${IFACE}" != "lo" -a "${IFACE}" != "lo0" ]; then
+ elif [ "${IFACE}" != "lo" ] && [ "${IFACE}" != "lo0" ]; then
: $(( metric += $(_ifindex) ))
fi
@@ -698,7 +706,7 @@ start()
[ -z "${config}" ] && break
set -- ${config}
- if [ "$1" != "null" -a "$1" != "noop" ]; then
+ if [ "$1" != "null" ] && [ "$1" != "noop" ]; then
ebegin "$1"
fi
eindent
@@ -754,7 +762,7 @@ start()
if [ -z "${routes}" ]; then
routes="$(_get_array "routes_${IFVAR}")"
fi
- if [ "${IFACE}" = "lo" -o "${IFACE}" = "lo0" ]; then
+ if [ "${IFACE}" = "lo" ] || [ "${IFACE}" = "lo0" ]; then
if [ "${config_0}" != "null" ]; then
routes="127.0.0.0/8 via 127.0.0.1
${routes}"
@@ -780,11 +788,11 @@ ${routes}"
ebegin ${cmd}
# Work out if we're a host or a net if not told
case ${cmd} in
- -net" "*|-host" "*);;
- *" "netmask" "*) cmd="-net ${cmd}";;
+ -net\ *|-host\ *);;
+ *\ netmask\ *) cmd="-net ${cmd}";;
*.*.*.*/32*) cmd="-host ${cmd}";;
- *.*.*.*/*|0.0.0.0|0.0.0.0" "*) cmd="-net ${cmd}";;
- default|default" "*) cmd="-net ${cmd}";;
+ *.*.*.*/*|0.0.0.0|0.0.0.0\ *) cmd="-net ${cmd}";;
+ default|default\ *) cmd="-net ${cmd}";;
*:*/128*) cmd="-host ${cmd}";;
*:*/*) cmd="-net ${cmd}";;
*) cmd="-host ${cmd}";;
next reply other threads:[~2019-04-21 5:34 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-21 5:34 Robin H. Johnson [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-07 9:42 [gentoo-commits] proj/netifrc:master commit in: init.d/ Sam James
2021-03-31 1:11 Patrick McLean
2020-09-07 13:03 Lars Wendler
2019-04-21 5:34 Robin H. Johnson
2019-04-21 5:34 Robin H. Johnson
2019-04-21 5:34 Robin H. Johnson
2019-04-21 5:34 Robin H. Johnson
2019-04-21 5:34 Robin H. Johnson
2019-04-21 5:34 Robin H. Johnson
2019-04-21 5:34 Robin H. Johnson
2019-04-21 5:34 Robin H. Johnson
2019-04-21 5:34 Robin H. Johnson
2019-04-21 5:34 Robin H. Johnson
2019-04-21 5:34 Robin H. Johnson
2019-04-21 5:34 Robin H. Johnson
2019-04-21 5:34 Robin H. Johnson
2017-11-14 20:48 Robin H. Johnson
2017-11-14 20:48 Robin H. Johnson
2016-10-24 20:52 Robin H. Johnson
2016-10-24 0:23 Robin H. Johnson
2016-10-24 0:23 Robin H. Johnson
2016-10-23 23:50 Robin H. Johnson
2016-07-05 18:13 Robin H. Johnson
2015-11-08 14:30 Robin H. Johnson
2015-11-08 14:30 Robin H. Johnson
2015-05-25 10:04 Mike Frysinger
2015-05-25 10:01 Mike Frysinger
2015-01-09 17:17 Robin H. Johnson
2014-10-11 19:47 Robin H. Johnson
2014-07-17 17:56 Robin H. Johnson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1555824820.1ae3f8e257032e753713b6582e23121984c0f9fa.robbat2@OpenRC \
--to=robbat2@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox