From cd60e63480b01039fe8b6cfee56e63428078a32f Mon Sep 17 00:00:00 2001 From: Tim Niemeyer Date: Sat, 11 Jun 2016 17:20:48 +0200 Subject: [PATCH] fff-nodewatcher: style: fix some long lines Signed-off-by: Tim Niemeyer Reviewed-by: Jan Kraus Reviewed-by: Tobias Klaus --- .../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 cffb0d2..3d15f4d 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="online$status_text$hostname${description}${geo}${position_comment}${contact}$distname$distversion$cpu$model$memory$load$uptime$local_time$batman_adv_version$kernel_version$fastd_version$nodewatcher_version$FIRMWARE_VERSION$FIRMWARE_COMMUNITY$BUILD_DATE$OPENWRT_CORE_REVISION$OPENWRT_FEEDS_PACKAGES_REVISION" + + SYSTEM_DATA="online" + SYSTEM_DATA=$SYSTEM_DATA"$status_text" + SYSTEM_DATA=$SYSTEM_DATA"$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" + SYSTEM_DATA=$SYSTEM_DATA"$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" + SYSTEM_DATA=$SYSTEM_DATA"$batman_adv_version" + SYSTEM_DATA=$SYSTEM_DATA"$kernel_version" + SYSTEM_DATA=$SYSTEM_DATA"$fastd_version" + SYSTEM_DATA=$SYSTEM_DATA"$nodewatcher_version" + SYSTEM_DATA=$SYSTEM_DATA"$FIRMWARE_VERSION" + SYSTEM_DATA=$SYSTEM_DATA"$FIRMWARE_COMMUNITY" + SYSTEM_DATA=$SYSTEM_DATA"$BUILD_DATE" + SYSTEM_DATA=$SYSTEM_DATA"$OPENWRT_CORE_REVISION" + SYSTEM_DATA=$SYSTEM_DATA"$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="$SYSTEM_DATA$interface_data$BATMAN_ADV_INTERFACES$batman_adv_originators$batman_adv_gateway_mode$batman_adv_gateway_list$client_count" + DATA="" + DATA=$DATA"$SYSTEM_DATA" + DATA=$DATA"$interface_data" + DATA=$DATA"$BATMAN_ADV_INTERFACES" + DATA=$DATA"$batman_adv_originators" + DATA=$DATA"$batman_adv_gateway_mode" + DATA=$DATA"$batman_adv_gateway_list" + DATA=$DATA"$client_count" + DATA=$DATA"" #write data to hxml file that provides the data on httpd SCRIPT_DATA_DIR=$(dirname $SCRIPT_DATA_FILE)