From: "Thomas Deutschmann" <whissi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/files/
Date: Tue, 20 Dec 2016 14:19:13 +0000 (UTC) [thread overview]
Message-ID: <1482243532.0dd7636ffc8d8522454176ddfd4d0c3088d15edd.whissi@gentoo> (raw)
commit: 0dd7636ffc8d8522454176ddfd4d0c3088d15edd
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 14:12:13 2016 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 14:18:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dd7636f
net-firewall/shorewall: fix bashisms in init.d script
Package-Manager: Portage-2.3.2, Repoman-2.3.1
net-firewall/shorewall/files/shorewall-lite.initd-r2 | 6 ++++--
net-firewall/shorewall/files/shorewall.initd-r2 | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/net-firewall/shorewall/files/shorewall-lite.initd-r2 b/net-firewall/shorewall/files/shorewall-lite.initd-r2
index 689f94b..7777e3b 100644
--- a/net-firewall/shorewall/files/shorewall-lite.initd-r2
+++ b/net-firewall/shorewall/files/shorewall-lite.initd-r2
@@ -3,7 +3,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-if [[ "${RC_SVCNAME}" == "shorewall6-lite" ]]; then
+if [ "${RC_SVCNAME}" = "shorewall6-lite" ]; then
PRODUCT_NAME="Shorewall6-Lite"
command="/usr/sbin/shorewall6-lite"
else
@@ -51,9 +51,11 @@ reset() {
}
restart() {
+ local _retval
ebegin "Restarting ${RC_SVCNAME}"
${command} status 1>/dev/null
- if [ $? != 0 ] ; then
+ _retval=$?
+ if [ ${_retval} = '0' ]; then
svc_start
else
${command} ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
diff --git a/net-firewall/shorewall/files/shorewall.initd-r2 b/net-firewall/shorewall/files/shorewall.initd-r2
index c23bfb7..fa02b14 100644
--- a/net-firewall/shorewall/files/shorewall.initd-r2
+++ b/net-firewall/shorewall/files/shorewall.initd-r2
@@ -3,7 +3,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-if [[ "${RC_SVCNAME}" == "shorewall6" ]]; then
+if [ "${RC_SVCNAME}" = "shorewall6" ]; then
PRODUCT_NAME="Shorewall6"
command="/usr/sbin/shorewall6"
else
@@ -68,9 +68,11 @@ reset() {
}
restart() {
+ local _retval
ebegin "Restarting ${RC_SVCNAME}"
${command} status 1>/dev/null
- if [ $? != 0 ] ; then
+ _retval=$?
+ if [ ${_retval} = '0' ]; then
svc_start
else
${command} ${OPTIONS} restart ${RESTARTOPTIONS} 1>/dev/null
next reply other threads:[~2016-12-20 14:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-20 14:19 Thomas Deutschmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-04-15 12:43 [gentoo-commits] repo/gentoo:master commit in: net-firewall/shorewall/files/ David Seifert
2017-11-27 4:39 Thomas Deutschmann
2016-05-23 11:33 Ian Delaney
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=1482243532.0dd7636ffc8d8522454176ddfd4d0c3088d15edd.whissi@gentoo \
--to=whissi@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