From: "Peter Müller" <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 1/1] hostapd: clean up shell script
Date: Sat, 02 May 2020 11:15:54 +0200 [thread overview]
Message-ID: <0abe1e62-89ba-ed69-a05d-bfd2aaacaf6b@ipfire.org> (raw)
In-Reply-To: <e23bc165-3fbd-288f-9edc-c9d2e8cc0eb2@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 4207 bytes --]
- replaced /bin/sh by /bin/bash
- fixed indentaion
- updated copyright banner
- attempt to eliminate shellcheck issues
Partially fixes: #12398
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
src/initscripts/packages/hostapd | 38 ++++++++++++++++++++++++--------
1 file changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/initscripts/packages/hostapd b/src/initscripts/packages/hostapd
index 5945375f3..60f50cace 100644
--- a/src/initscripts/packages/hostapd
+++ b/src/initscripts/packages/hostapd
@@ -1,6 +1,26 @@
-#!/bin/sh
+#!/bin/bash
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
. /etc/sysconfig/rc
-. ${rc_functions}
+. "${rc_functions}"
CHANNEL="6"
COUNTRY="00"
@@ -8,7 +28,7 @@ TXPOWER="auto"
INTERFACE="blue0"
MACMODE="0"
-eval $(/usr/local/bin/readhash /var/ipfire/wlanap/settings)
+eval "$(/usr/local/bin/readhash /var/ipfire/wlanap/settings)"
case "${1}" in
start)
@@ -18,21 +38,21 @@ case "${1}" in
# Check Interface configuration
if [ ! -d "/sys/class/net/${INTERFACE}" ]; then
- boot_mesg "Interface $INTERFACE doesn't exist." ${FAILURE}
+ boot_mesg "Interface $INTERFACE doesn't exist." "${FAILURE}"
echo_failure
exit 0
fi
if [ "$(ip link show $INTERFACE | /bin/grep "ether")" == "" ]; then
- boot_mesg "Interface $INTERFACE is assigned to wlan master device." ${FAILURE}
- boot_mesg "Please reboot to fix this." ${FAILURE}
+ boot_mesg "Interface $INTERFACE is assigned to wlan master device." "${FAILURE}"
+ boot_mesg "Please reboot to fix this." "${FAILURE}"
echo_failure
exit 0
fi
# Check if INTERFACE is an actual wireless device
if [ ! -d "/sys/class/net/${INTERFACE}/wireless" ]; then
- boot_mesg "Interface $INTERFACE is not a wireless device." ${FAILURE}
+ boot_mesg "Interface $INTERFACE is not a wireless device." "${FAILURE}"
echo_failure
exit 0
fi
@@ -45,7 +65,7 @@ case "${1}" in
DRIVER="HOSTAP"
driver="hostap"
else
- boot_mesg "Interface $INTERFACE is a not supported wireless device." ${FAILURE}
+ boot_mesg "Interface $INTERFACE is a not supported wireless device." "${FAILURE}"
echo_failure
exit 0
fi
@@ -86,7 +106,7 @@ case "${1}" in
if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
killproc /usr/bin/hostapd > /dev/null 2>&1
- boot_mesg "Try to create additional AP device ..."
+ boot_mesg "Try to create additional AP device ..."
ip link set ${INTERFACE} down
ip link set ${INTERFACE} name ${INTERFACE}_man
iw dev ${INTERFACE}_man interface add ${INTERFACE} type __ap
--
2.26.1
next prev parent reply other threads:[~2020-05-02 9:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-02 9:15 [PATCH 0/1] " Peter Müller
2020-05-02 9:15 ` Peter Müller [this message]
2020-05-04 14:34 ` [PATCH 1/1] " Michael Tremer
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=0abe1e62-89ba-ed69-a05d-bfd2aaacaf6b@ipfire.org \
--to=peter.mueller@ipfire.org \
--cc=development@lists.ipfire.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