[v2] Add Hoodinformation to Nodewatcher

Submitted by Christian Dresel on July 2, 2017, 2:46 p.m.

Details

Message ID 1499006779-31147-1-git-send-email-fff@chrisi01.de
State Accepted
Headers show

Commit Message

Christian Dresel July 2, 2017, 2:46 p.m. 
Fixes: #38
---
 src/packages/fff/fff-nodewatcher/Makefile                   | 2 +-
 src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox 

diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-nodewatcher/Makefile
index 56b0508..73a221e 100644
--- a/src/packages/fff/fff-nodewatcher/Makefile
+++ b/src/packages/fff/fff-nodewatcher/Makefile
@@ -1,7 +1,7 @@ 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-nodewatcher
-PKG_VERSION:=40
+PKG_VERSION:=41
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/fff-nodewatcher
diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
index 930463a..6e0e538 100755
--- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
+++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
@@ -2,7 +2,7 @@ 
 # Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
 # License; GPL v3
 
-SCRIPT_VERSION="40"
+SCRIPT_VERSION="41"
 
 test -f /tmp/started || exit
 
@@ -135,6 +135,10 @@  crawl() {
     SYSTEM_DATA=$SYSTEM_DATA"${geo}"
     SYSTEM_DATA=$SYSTEM_DATA"${position_comment}"
     SYSTEM_DATA=$SYSTEM_DATA"${contact}"
+    if [ "$(uci -q get "system.@system[0].hood")" ] 
+    then                                                                                                                         
+        SYSTEM_DATA=$SYSTEM_DATA"<hood>$(uci -q get "system.@system[0].hood")</hood>"                                            
+    fi  
     SYSTEM_DATA=$SYSTEM_DATA"<distname>$distname</distname>"
     SYSTEM_DATA=$SYSTEM_DATA"<distversion>$distversion</distversion>"
     SYSTEM_DATA=$SYSTEM_DATA"$cpu"

Comments

Tim Niemeyer July 2, 2017, 2:47 p.m. 
Hi

Jetzt isses perfekt.

Danke!

Reviewed-by: Tim Niemeyer <tim@tn-x.org>

Tim

Am Sonntag, den 02.07.2017, 16:46 +0200 schrieb Christian Dresel:
> Fixes: #38
> ---
>  src/packages/fff/fff-nodewatcher/Makefile                   | 2 +-
>  src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 6 +++++-
>  2 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-nodewatcher/Makefile
> index 56b0508..73a221e 100644
> --- a/src/packages/fff/fff-nodewatcher/Makefile
> +++ b/src/packages/fff/fff-nodewatcher/Makefile
> @@ -1,7 +1,7 @@
>  include $(TOPDIR)/rules.mk
>  
>  PKG_NAME:=fff-nodewatcher
> -PKG_VERSION:=40
> +PKG_VERSION:=41
>  PKG_RELEASE:=1
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/fff-nodewatcher
> diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> index 930463a..6e0e538 100755
> --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> @@ -2,7 +2,7 @@
>  # Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
>  # License; GPL v3
>  
> -SCRIPT_VERSION="40"
> +SCRIPT_VERSION="41"
>  
>  test -f /tmp/started || exit
>  
> @@ -135,6 +135,10 @@ crawl() {
>      SYSTEM_DATA=$SYSTEM_DATA"${geo}"
>      SYSTEM_DATA=$SYSTEM_DATA"${position_comment}"
>      SYSTEM_DATA=$SYSTEM_DATA"${contact}"
> +    if [ "$(uci -q get "system.@system[0].hood")" ] 
> +    then                                                                                                                         
> +        SYSTEM_DATA=$SYSTEM_DATA"<hood>$(uci -q get "system.@system[0].hood")</hood>"                                            
> +    fi  
>      SYSTEM_DATA=$SYSTEM_DATA"<distname>$distname</distname>"
>      SYSTEM_DATA=$SYSTEM_DATA"<distversion>$distversion</distversion>"
>      SYSTEM_DATA=$SYSTEM_DATA"$cpu"
> -- 
> 2.1.4
>
Tim Niemeyer July 2, 2017, 3:48 p.m. 
Am Sonntag, den 02.07.2017, 16:47 +0200 schrieb Tim Niemeyer:
> Hi
> 
> Jetzt isses perfekt.
Und applied.

Tim
> 
> Danke!
> 
> Reviewed-by: Tim Niemeyer <tim@tn-x.org>
> 
> Tim
> 
> Am Sonntag, den 02.07.2017, 16:46 +0200 schrieb Christian Dresel:
> > Fixes: #38
> > ---
> >  src/packages/fff/fff-nodewatcher/Makefile                   | 2 +-
> >  src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 6 +++++-
> >  2 files changed, 6 insertions(+), 2 deletions(-)
> > 
> > diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-nodewatcher/Makefile
> > index 56b0508..73a221e 100644
> > --- a/src/packages/fff/fff-nodewatcher/Makefile
> > +++ b/src/packages/fff/fff-nodewatcher/Makefile
> > @@ -1,7 +1,7 @@
> >  include $(TOPDIR)/rules.mk
> >  
> >  PKG_NAME:=fff-nodewatcher
> > -PKG_VERSION:=40
> > +PKG_VERSION:=41
> >  PKG_RELEASE:=1
> >  
> >  PKG_BUILD_DIR:=$(BUILD_DIR)/fff-nodewatcher
> > diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> > index 930463a..6e0e538 100755
> > --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> > +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> > @@ -2,7 +2,7 @@
> >  # Netmon Nodewatcher (C) 2010-2012 Freifunk Oldenburg
> >  # License; GPL v3
> >  
> > -SCRIPT_VERSION="40"
> > +SCRIPT_VERSION="41"
> >  
> >  test -f /tmp/started || exit
> >  
> > @@ -135,6 +135,10 @@ crawl() {
> >      SYSTEM_DATA=$SYSTEM_DATA"${geo}"
> >      SYSTEM_DATA=$SYSTEM_DATA"${position_comment}"
> >      SYSTEM_DATA=$SYSTEM_DATA"${contact}"
> > +    if [ "$(uci -q get "system.@system[0].hood")" ] 
> > +    then                                                                                                                         
> > +        SYSTEM_DATA=$SYSTEM_DATA"<hood>$(uci -q get "system.@system[0].hood")</hood>"                                            
> > +    fi  
> >      SYSTEM_DATA=$SYSTEM_DATA"<distname>$distname</distname>"
> >      SYSTEM_DATA=$SYSTEM_DATA"<distversion>$distversion</distversion>"
> >      SYSTEM_DATA=$SYSTEM_DATA"$cpu"
> > -- 
> > 2.1.4
> > 
> 
> -- 
> franken-dev mailing list
> franken-dev@freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net