fff-web/show_info: Put common code into function

Submitted by Adrian Schmutzler on Oct. 25, 2017, 12:54 p.m.

Details

Message ID 1508936072-3029-1-git-send-email-freifunk@adrianschmutzler.de
State Superseded
Headers show

Commit Message

Adrian Schmutzler Oct. 25, 2017, 12:54 p.m. 
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 .../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

Patch hide | download patch | download mbox 

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

Comments

Tim Niemeyer Nov. 4, 2017, 6:49 p.m. 
Hi

Beim Review ist mir aufgefallen, dass die Abhängigkeiten von fff-
support fehlen. Dazu habe ich ein Ticket eröffnet, sollte für dieses
Patch jetzt erstmal egal sein.

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

Tim

Am Mittwoch, den 25.10.2017, 14:54 +0200 schrieb Adrian Schmutzler:
> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> ---
>  .../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
> -- 
> 2.7.4
>
Tim Niemeyer Nov. 12, 2017, 4:25 p.m. 
Hi

Kannst du bitte rebasen?

Tim

Am Mittwoch, den 25.10.2017, 14:54 +0200 schrieb Adrian Schmutzler:
> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
> ---
>  .../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
> -- 
> 2.7.4
>