From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 1/1] hostapd: clean up shell script
Date: Mon, 04 May 2020 15:34:43 +0100
Message-ID: <F0B5CDFC-0CD8-4DB7-AFD2-8695CF944F0D@ipfire.org>
In-Reply-To: <0abe1e62-89ba-ed69-a05d-bfd2aaacaf6b@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2877967850817760059=="
List-Id: <development.lists.ipfire.org>

--===============2877967850817760059==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 2 May 2020, at 10:15, Peter M=C3=BCller <peter.mueller(a)ipfire.org> wro=
te:
>=20
> - replaced /bin/sh by /bin/bash
> - fixed indentaion
> - updated copyright banner
> - attempt to eliminate shellcheck issues
>=20
> Partially fixes: #12398
>=20
> Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
> ---
> src/initscripts/packages/hostapd | 38 ++++++++++++++++++++++++--------
> 1 file changed, 29 insertions(+), 9 deletions(-)
>=20
> diff --git a/src/initscripts/packages/hostapd b/src/initscripts/packages/ho=
stapd
> 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}"
>=20
> CHANNEL=3D"6"
> COUNTRY=3D"00"
> @@ -8,7 +28,7 @@ TXPOWER=3D"auto"
> INTERFACE=3D"blue0"
> MACMODE=3D"0"
>=20
> -eval $(/usr/local/bin/readhash /var/ipfire/wlanap/settings)
> +eval "$(/usr/local/bin/readhash /var/ipfire/wlanap/settings)"
>=20
> case "${1}" in
> 	start)
> @@ -18,21 +38,21 @@ case "${1}" in
>=20
> 		# 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
>=20
> 		if [ "$(ip link show $INTERFACE | /bin/grep "ether")" =3D=3D "" ]; then
> -			boot_mesg "Interface $INTERFACE is assigned to wlan master device." ${F=
AILURE}
> -			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
>=20
> 		# 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=3D"HOSTAP"
> 			driver=3D"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
>=20
> 		if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" =3D=3D =
"" ]; then
> 			killproc /usr/bin/hostapd > /dev/null 2>&1
> -			boot_mesg "Try to create additional AP device ..."=20
> +			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
> --=20
> 2.26.1


--===============2877967850817760059==--