[v2,3/7] fff-nodewatcher: style: fix some long lines

Submitted by Tim Niemeyer on June 11, 2016, 3:20 p.m.

Details

Message ID 1465658452-20513-4-git-send-email-tim@tn-x.org
State Accepted, archived
Commit cd60e63480b01039fe8b6cfee56e63428078a32f
Headers show

Commit Message

Tim Niemeyer June 11, 2016, 3:20 p.m.
Signed-off-by: Tim Niemeyer <tim@tn-x.org>
---

Changes in v2:
- Rebased with spaces

 .../fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 36 ++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
index 9617a06..6c75338 100755
--- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
+++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
@@ -117,7 +117,31 @@  crawl() {
     #OPENWRT_CORE_REVISION="35298"
     #OPENWRT_FEEDS_PACKAGES_REVISION="35298"
     . /etc/firmware_release
-    SYSTEM_DATA="<status>online</status>$status_text<hostname>$hostname</hostname>${description}${geo}${position_comment}${contact}<distname>$distname</distname><distversion>$distversion</distversion>$cpu$model$memory$load$uptime<local_time>$local_time</local_time><batman_advanced_version>$batman_adv_version</batman_advanced_version><kernel_version>$kernel_version</kernel_version><fastd_version>$fastd_version</fastd_version><nodewatcher_version>$nodewatcher_version</nodewatcher_version><firmware_version>$FIRMWARE_VERSION</firmware_version><firmware_community>$FIRMWARE_COMMUNITY</firmware_community><firmware_revision>$BUILD_DATE</firmware_revision><openwrt_core_revision>$OPENWRT_CORE_REVISION</openwrt_core_revision><openwrt_feeds_packages_revision>$OPENWRT_FEEDS_PACKAGES_REVISION</openwrt_feeds_packages_revision>"
+
+    SYSTEM_DATA="<status>online</status>"
+    SYSTEM_DATA=$SYSTEM_DATA"$status_text"
+    SYSTEM_DATA=$SYSTEM_DATA"<hostname>$hostname</hostname>"
+    SYSTEM_DATA=$SYSTEM_DATA"${description}"
+    SYSTEM_DATA=$SYSTEM_DATA"${geo}"
+    SYSTEM_DATA=$SYSTEM_DATA"${position_comment}"
+    SYSTEM_DATA=$SYSTEM_DATA"${contact}"
+    SYSTEM_DATA=$SYSTEM_DATA"<distname>$distname</distname>"
+    SYSTEM_DATA=$SYSTEM_DATA"<distversion>$distversion</distversion>"
+    SYSTEM_DATA=$SYSTEM_DATA"$cpu"
+    SYSTEM_DATA=$SYSTEM_DATA"$model"
+    SYSTEM_DATA=$SYSTEM_DATA"$memory"
+    SYSTEM_DATA=$SYSTEM_DATA"$load"
+    SYSTEM_DATA=$SYSTEM_DATA"$uptime"
+    SYSTEM_DATA=$SYSTEM_DATA"<local_time>$local_time</local_time>"
+    SYSTEM_DATA=$SYSTEM_DATA"<batman_advanced_version>$batman_adv_version</batman_advanced_version>"
+    SYSTEM_DATA=$SYSTEM_DATA"<kernel_version>$kernel_version</kernel_version>"
+    SYSTEM_DATA=$SYSTEM_DATA"<fastd_version>$fastd_version</fastd_version>"
+    SYSTEM_DATA=$SYSTEM_DATA"<nodewatcher_version>$nodewatcher_version</nodewatcher_version>"
+    SYSTEM_DATA=$SYSTEM_DATA"<firmware_version>$FIRMWARE_VERSION</firmware_version>"
+    SYSTEM_DATA=$SYSTEM_DATA"<firmware_community>$FIRMWARE_COMMUNITY</firmware_community>"
+    SYSTEM_DATA=$SYSTEM_DATA"<firmware_revision>$BUILD_DATE</firmware_revision>"
+    SYSTEM_DATA=$SYSTEM_DATA"<openwrt_core_revision>$OPENWRT_CORE_REVISION</openwrt_core_revision>"
+    SYSTEM_DATA=$SYSTEM_DATA"<openwrt_feeds_packages_revision>$OPENWRT_FEEDS_PACKAGES_REVISION</openwrt_feeds_packages_revision>"
 
     err "`date`: Collecting information from network interfaces"
 
@@ -213,7 +237,15 @@  crawl() {
 
     err "`date`: Putting all information into a XML-File and save it at "$SCRIPT_DATA_FILE
 
-    DATA="<?xml version='1.0' standalone='yes'?><data><system_data>$SYSTEM_DATA</system_data><interface_data>$interface_data</interface_data><batman_adv_interfaces>$BATMAN_ADV_INTERFACES</batman_adv_interfaces><batman_adv_originators>$batman_adv_originators</batman_adv_originators><batman_adv_gateway_mode>$batman_adv_gateway_mode</batman_adv_gateway_mode><batman_adv_gateway_list>$batman_adv_gateway_list</batman_adv_gateway_list><client_count>$client_count</client_count></data>"
+    DATA="<?xml version='1.0' standalone='yes'?><data>"
+    DATA=$DATA"<system_data>$SYSTEM_DATA</system_data>"
+    DATA=$DATA"<interface_data>$interface_data</interface_data>"
+    DATA=$DATA"<batman_adv_interfaces>$BATMAN_ADV_INTERFACES</batman_adv_interfaces>"
+    DATA=$DATA"<batman_adv_originators>$batman_adv_originators</batman_adv_originators>"
+    DATA=$DATA"<batman_adv_gateway_mode>$batman_adv_gateway_mode</batman_adv_gateway_mode>"
+    DATA=$DATA"<batman_adv_gateway_list>$batman_adv_gateway_list</batman_adv_gateway_list>"
+    DATA=$DATA"<client_count>$client_count</client_count>"
+    DATA=$DATA"</data>"
 
     #write data to hxml file that provides the data on httpd
     SCRIPT_DATA_DIR=$(dirname $SCRIPT_DATA_FILE)

Comments

Jan Kraus June 11, 2016, 9:17 p.m.
Reviewed-by: Jan Kraus <mayosemmel@gmail.com>

Am Samstag, den 11.06.2016, 17:20 +0200 schrieb Tim Niemeyer:
> Signed-off-by: Tim Niemeyer <tim@tn-x.org>
> ---
> 
> Changes in v2:
> - Rebased with spaces
> 
>  .../fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 36 ++++++++++++++++++++--
>  1 file changed, 34 insertions(+), 2 deletions(-)
> 
> diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> index 9617a06..6c75338 100755
> --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> @@ -117,7 +117,31 @@ crawl() {
>      #OPENWRT_CORE_REVISION="35298"
>      #OPENWRT_FEEDS_PACKAGES_REVISION="35298"
>      . /etc/firmware_release
> -    SYSTEM_DATA="<status>online</status>$status_text<hostname>$hostname</hostname>${description}${geo}${position_comment}${contact}<distname>$distname</distname><distversion>$distversion</distversion>$cpu$model$memory$load$uptime<local_time>$local_time</local_time><batman_advanced_version>$batman_adv_version</batman_advanced_version><kernel_version>$kernel_version</kernel_version><fastd_version>$fastd_version</fastd_version><nodewatcher_version>$nodewatcher_version</nodewatcher_version><firmware_version>$FIRMWARE_VERSION</firmware_version><firmware_community>$FIRMWARE_COMMUNITY</firmware_community><firmware_revision>$BUILD_DATE</firmware_revision><openwrt_core_revision>$OPENWRT_CORE_REVISION</openwrt_core_revision><openwrt_feeds_packages_revision>$OPENWRT_FEEDS_PACKAGES_REVISION</openwrt_feeds_packages_revision>"
> +
> +    SYSTEM_DATA="<status>online</status>"
> +    SYSTEM_DATA=$SYSTEM_DATA"$status_text"
> +    SYSTEM_DATA=$SYSTEM_DATA"<hostname>$hostname</hostname>"
> +    SYSTEM_DATA=$SYSTEM_DATA"${description}"
> +    SYSTEM_DATA=$SYSTEM_DATA"${geo}"
> +    SYSTEM_DATA=$SYSTEM_DATA"${position_comment}"
> +    SYSTEM_DATA=$SYSTEM_DATA"${contact}"
> +    SYSTEM_DATA=$SYSTEM_DATA"<distname>$distname</distname>"
> +    SYSTEM_DATA=$SYSTEM_DATA"<distversion>$distversion</distversion>"
> +    SYSTEM_DATA=$SYSTEM_DATA"$cpu"
> +    SYSTEM_DATA=$SYSTEM_DATA"$model"
> +    SYSTEM_DATA=$SYSTEM_DATA"$memory"
> +    SYSTEM_DATA=$SYSTEM_DATA"$load"
> +    SYSTEM_DATA=$SYSTEM_DATA"$uptime"
> +    SYSTEM_DATA=$SYSTEM_DATA"<local_time>$local_time</local_time>"
> +    SYSTEM_DATA=$SYSTEM_DATA"<batman_advanced_version>$batman_adv_version</batman_advanced_version>"
> +    SYSTEM_DATA=$SYSTEM_DATA"<kernel_version>$kernel_version</kernel_version>"
> +    SYSTEM_DATA=$SYSTEM_DATA"<fastd_version>$fastd_version</fastd_version>"
> +    SYSTEM_DATA=$SYSTEM_DATA"<nodewatcher_version>$nodewatcher_version</nodewatcher_version>"
> +    SYSTEM_DATA=$SYSTEM_DATA"<firmware_version>$FIRMWARE_VERSION</firmware_version>"
> +    SYSTEM_DATA=$SYSTEM_DATA"<firmware_community>$FIRMWARE_COMMUNITY</firmware_community>"
> +    SYSTEM_DATA=$SYSTEM_DATA"<firmware_revision>$BUILD_DATE</firmware_revision>"
> +    SYSTEM_DATA=$SYSTEM_DATA"<openwrt_core_revision>$OPENWRT_CORE_REVISION</openwrt_core_revision>"
> +    SYSTEM_DATA=$SYSTEM_DATA"<openwrt_feeds_packages_revision>$OPENWRT_FEEDS_PACKAGES_REVISION</openwrt_feeds_packages_revision>"
>  
>      err "`date`: Collecting information from network interfaces"
>  
> @@ -213,7 +237,15 @@ crawl() {
>  
>      err "`date`: Putting all information into a XML-File and save it at "$SCRIPT_DATA_FILE
>  
> -    DATA="<?xml version='1.0' standalone='yes'?><data><system_data>$SYSTEM_DATA</system_data><interface_data>$interface_data</interface_data><batman_adv_interfaces>$BATMAN_ADV_INTERFACES</batman_adv_interfaces><batman_adv_originators>$batman_adv_originators</batman_adv_originators><batman_adv_gateway_mode>$batman_adv_gateway_mode</batman_adv_gateway_mode><batman_adv_gateway_list>$batman_adv_gateway_list</batman_adv_gateway_list><client_count>$client_count</client_count></data>"
> +    DATA="<?xml version='1.0' standalone='yes'?><data>"
> +    DATA=$DATA"<system_data>$SYSTEM_DATA</system_data>"
> +    DATA=$DATA"<interface_data>$interface_data</interface_data>"
> +    DATA=$DATA"<batman_adv_interfaces>$BATMAN_ADV_INTERFACES</batman_adv_interfaces>"
> +    DATA=$DATA"<batman_adv_originators>$batman_adv_originators</batman_adv_originators>"
> +    DATA=$DATA"<batman_adv_gateway_mode>$batman_adv_gateway_mode</batman_adv_gateway_mode>"
> +    DATA=$DATA"<batman_adv_gateway_list>$batman_adv_gateway_list</batman_adv_gateway_list>"
> +    DATA=$DATA"<client_count>$client_count</client_count>"
> +    DATA=$DATA"</data>"
>  
>      #write data to hxml file that provides the data on httpd
>      SCRIPT_DATA_DIR=$(dirname $SCRIPT_DATA_FILE)
> -- 
> 2.1.4
>