From patchwork Wed Oct 25 12:54:32 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: fff-web/show_info: Put common code into function
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
X-Patchwork-Id: 627
Message-Id: <1508936072-3029-1-git-send-email-freifunk@adrianschmutzler.de>
To: franken-dev@freifunk.net
Date: Wed, 25 Oct 2017 14:54:32 +0200

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Tim Niemeyer <tim@tn-x.org>
---
 .../fff/fff-network/files/lib/functions/fff/evalbytes     | 15 +++++++++++++++
 src/packages/fff/fff-support/files/usr/sbin/show_info     | 13 +------------
 src/packages/fff/fff-web/files/www/ssl/cgi-bin/helpers    | 14 +-------------
 3 files changed, 17 insertions(+), 25 deletions(-)
 create mode 100644 src/packages/fff/fff-network/files/lib/functions/fff/evalbytes

diff --git a/src/packages/fff/fff-network/files/lib/functions/fff/evalbytes b/src/packages/fff/fff-network/files/lib/functions/fff/evalbytes
new file mode 100644
index 0000000..e550381
--- /dev/null
+++ b/src/packages/fff/fff-network/files/lib/functions/fff/evalbytes
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+human_bytes() {
+	while read B ; do
+		[ $B -lt 1024 ] && echo ${B} B && return
+		KB=$(((B+512)/1024))
+		[ $KB -lt 1024 ] && echo ${KB} KB && return
+		MB=$(((KB+512)/1024))
+		[ $MB -lt 1024 ] && echo ${MB} MB && return
+		GB=$(((MB+512)/1024))
+		[ $GB -lt 1024 ] && echo ${GB} GB && return
+		echo $(((GB+512)/1024)) TB && return
+	done
+	echo "-"
+}
diff --git a/src/packages/fff/fff-support/files/usr/sbin/show_info b/src/packages/fff/fff-support/files/usr/sbin/show_info
index d44c0f0..95c8853 100755
--- a/src/packages/fff/fff-support/files/usr/sbin/show_info
+++ b/src/packages/fff/fff-support/files/usr/sbin/show_info
@@ -2,24 +2,13 @@
 
 . /etc/firmware_release
 . /lib/functions/fff/evalhoodinfo
+. /lib/functions/fff/evalbytes
 
 board_name=$(uci -q get board.model.name)
 
 HOSTNAME="$(uci -q get 'system.@system[0].hostname')"
 hood="$(uci -q get "system.@system[0].hood")"
 
-human_bytes() {
-	while read B ; do
-		[ $B -lt 1024 ] && echo ${B} B && break
-		KB=$(((B+512)/1024))
-		[ $KB -lt 1024 ] && echo ${KB} KB && break
-		MB=$(((KB+512)/1024))
-		[ $MB -lt 1024 ] && echo ${MB} MB && break
-		GB=$(((MB+512)/1024))
-		[ $GB -lt 1024 ] && echo ${GB} GB && break
-		echo $(((GB+512)/1024)) TB
-	done
-}
 format_state() {
 	batmanports=$(swconfig dev switch0 vlan 3 show | grep 'ports:')
 	clientports=$(swconfig dev switch0 vlan 1 show | grep 'ports:')
diff --git a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/helpers b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/helpers
index 5e0196c..b9edef1 100755
--- a/src/packages/fff/fff-web/files/www/ssl/cgi-bin/helpers
+++ b/src/packages/fff/fff-web/files/www/ssl/cgi-bin/helpers
@@ -1,19 +1,7 @@
 #!/usr/bin/haserl
 
 <%
-human_bytes() {
-	while read B ; do
-		[ $B -lt 1024 ] && echo ${B} B && return
-		KB=$(((B+512)/1024))
-		[ $KB -lt 1024 ] && echo ${KB} KB && return
-		MB=$(((KB+512)/1024))
-		[ $MB -lt 1024 ] && echo ${MB} MB && return
-		GB=$(((MB+512)/1024))
-		[ $GB -lt 1024 ] && echo ${GB} GB && return
-		echo $(((GB+512)/1024)) TB && return
-	done
-	echo "-"
-}
+. /lib/functions/fff/evalbytes
 
 show_msg() {
 	if [ "$MSG" != "" ] ; then