| Message ID | 20190414201936.1769-1-freifunk@adrianschmutzler.de |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood index 15f08550..c3b56b3e 100755 --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood @@ -22,7 +22,7 @@ rm -f "$hoodfiletmp" # Gatewaycheck function isGatewayAvailable() { - if [ "$(batctl gwl | wc -l)" -gt 2 ]; then + if [ -n "$(batctl gwl -H)" ]; then return 0 else return 1
Reviewed-by: Fabian Bläse <fabian@blaese.de> On 14.04.19 22:19, Adrian Schmutzler wrote: > Since batctl can suppress headers, we do not have to count lines. > > Cosmetical change. > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > --- > src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > index 15f08550..c3b56b3e 100755 > --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > @@ -22,7 +22,7 @@ rm -f "$hoodfiletmp" > > # Gatewaycheck function > isGatewayAvailable() { > - if [ "$(batctl gwl | wc -l)" -gt 2 ]; then > + if [ -n "$(batctl gwl -H)" ]; then > return 0 > else > return 1 >
Hi Adrian, Reviewed-by: Robert Langhammer <rlanghammer@web.de> Am 14.04.19 um 22:19 schrieb Adrian Schmutzler: > Since batctl can suppress headers, we do not have to count lines. > > Cosmetical change. > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > --- > src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > index 15f08550..c3b56b3e 100755 > --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > @@ -22,7 +22,7 @@ rm -f "$hoodfiletmp" > > # Gatewaycheck function > isGatewayAvailable() { > - if [ "$(batctl gwl | wc -l)" -gt 2 ]; then > + if [ -n "$(batctl gwl -H)" ]; then > return 0 > else > return 1
Applied. > -----Original Message----- > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf Of > robert > Sent: Sonntag, 14. April 2019 23:03 > To: franken-dev@freifunk.net > Subject: Re: [PATCH] configurehood: Leverage -H option for batctl > > Hi Adrian, > > Reviewed-by: Robert Langhammer <rlanghammer@web.de> > > Am 14.04.19 um 22:19 schrieb Adrian Schmutzler: > > Since batctl can suppress headers, we do not have to count lines. > > > > Cosmetical change. > > > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > > --- > > src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > index 15f08550..c3b56b3e 100755 > > --- a/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > +++ b/src/packages/fff/fff-hoods/files/usr/sbin/configurehood > > @@ -22,7 +22,7 @@ rm -f "$hoodfiletmp" > > > > # Gatewaycheck function > > isGatewayAvailable() { > > - if [ "$(batctl gwl | wc -l)" -gt 2 ]; then > > + if [ -n "$(batctl gwl -H)" ]; then > > return 0 > > else > > return 1
Since batctl can suppress headers, we do not have to count lines. Cosmetical change. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- src/packages/fff/fff-hoods/files/usr/sbin/configurehood | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)