| Message ID | 20170703223659.21290-1-tk+ff@meskal.net |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher index 6e0e538..f9d6e65 100755 --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher @@ -104,7 +104,7 @@ crawl() { fi #Checks whether either fastd or L2TP is connected - if [ pidof fastd >/dev/null ] || [ grep -q '1' /sys/class/net/l2tp*/carrier ] ; then + if pidof fastd >/dev/null || grep -q '1' /sys/class/net/l2tp*/carrier 2> /dev/null ; then vpn_active="<vpn_active>1</vpn_active>" else vpn_active="<vpn_active>0</vpn_active>"
Hi
Du meinst sicher den shellcheck parsing error?:
In nodewatcher line 107:
if [ pidof fastd >/dev/null ] || [ grep -q '1' /sys/class/net/l2tp*/carrier ] ; then
^-- SC1009: The mentioned parser error was in this if expression.
^-- SC1073: Couldn't parse this test expression.
^-- SC1072: Unexpected "f". Fix any mentioned problems and try again.
Reviewed-by: Tim Niemeyer <tim@tn-x.org>
Tim
Am Dienstag, den 04.07.2017, 00:36 +0200 schrieb Tobias Klaus:
> ---
> src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> index 6e0e538..f9d6e65 100755
> --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> @@ -104,7 +104,7 @@ crawl() {
> fi
>
> #Checks whether either fastd or L2TP is connected
> - if [ pidof fastd >/dev/null ] || [ grep -q '1' /sys/class/net/l2tp*/carrier ] ; then
> + if pidof fastd >/dev/null || grep -q '1' /sys/class/net/l2tp*/carrier 2> /dev/null ; then
> vpn_active="<vpn_active>1</vpn_active>"
> else
> vpn_active="<vpn_active>0</vpn_active>"
> --
> 2.13.2
>
Hallo, danke fürs Review. Am Sonntag, 9. Juli 2017, 12:40:49 CEST schrieb Tim Niemeyer: > Hi > > Du meinst sicher den shellcheck parsing error?: > In nodewatcher line 107: > if [ pidof fastd >/dev/null ] || [ grep -q '1' > /sys/class/net/l2tp*/carrier ] ; then ^-- SC1009: The mentioned parser > error was in this if expression. ^-- SC1073: Couldn't parse this test > expression. > ^-- SC1072: Unexpected "f". Fix any mentioned problems and > try again. Jein, die Shell selber hat schon auch gemeckert, deswegen hatte ich es gefunden. Grüße Tobias > > Reviewed-by: Tim Niemeyer <tim@tn-x.org> > > Tim > > Am Dienstag, den 04.07.2017, 00:36 +0200 schrieb Tobias Klaus: > > --- > > > > src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher > > b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher index > > 6e0e538..f9d6e65 100755 > > --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher > > +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher > > @@ -104,7 +104,7 @@ crawl() { > > > > fi > > > > #Checks whether either fastd or L2TP is connected > > > > - if [ pidof fastd >/dev/null ] || [ grep -q '1' > > /sys/class/net/l2tp*/carrier ] ; then + if pidof fastd >/dev/null || > > grep -q '1' /sys/class/net/l2tp*/carrier 2> /dev/null ; then> > > vpn_active="<vpn_active>1</vpn_active>" > > > > else > > > > vpn_active="<vpn_active>0</vpn_active>"
Tested-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Läuft auf meinen Routern schon seit Wochen :-) -----Original Message----- From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf Of Tobias Klaus Sent: Montag, 10. Juli 2017 09:45 To: franken-dev@freifunk.net; Tim Niemeyer <tim@tn-x.org> Subject: Re: [PATCH] nodewatcher: fix parsing error Hallo, danke fürs Review. Am Sonntag, 9. Juli 2017, 12:40:49 CEST schrieb Tim Niemeyer: > Hi > > Du meinst sicher den shellcheck parsing error?: > In nodewatcher line 107: > if [ pidof fastd >/dev/null ] || [ grep -q '1' > /sys/class/net/l2tp*/carrier ] ; then ^-- SC1009: The mentioned parser > error was in this if expression. ^-- SC1073: Couldn't parse this test > expression. > ^-- SC1072: Unexpected "f". Fix any mentioned problems > and try again. Jein, die Shell selber hat schon auch gemeckert, deswegen hatte ich es gefunden. Grüße Tobias > > Reviewed-by: Tim Niemeyer <tim@tn-x.org> > > Tim > > Am Dienstag, den 04.07.2017, 00:36 +0200 schrieb Tobias Klaus: > > --- > > > > src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git > > a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher > > b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher index > > 6e0e538..f9d6e65 100755 > > --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher > > +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher > > @@ -104,7 +104,7 @@ crawl() { > > > > fi > > > > #Checks whether either fastd or L2TP is connected > > > > - if [ pidof fastd >/dev/null ] || [ grep -q '1' > > /sys/class/net/l2tp*/carrier ] ; then + if pidof fastd >/dev/null || > > grep -q '1' /sys/class/net/l2tp*/carrier 2> /dev/null ; then> > > vpn_active="<vpn_active>1</vpn_active>" > > > > else > > > > vpn_active="<vpn_active>0</vpn_active>" -- franken-dev mailing list franken-dev@freifunk.net http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net