[PATCH v2] fff-web/show_info: Put common code into function

[Tim Niemeyer]

Hi

Danke

Und applied.

Tim

Am Sonntag, den 12.11.2017, 23:49 +0100 schrieb Adrian Schmutzler:
> Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> 
> Reviewed-by: Tim Niemeyer <tim at tn-x.org>
> 
> ---
> 
> v2: Rebase
> ---
>  .../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 6baa428..47a259c 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 'fff.system.hostname')
>  hood="$(uci -q get "system. at 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
> 

-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : signature.asc
Dateityp    : application/pgp-signature
Dateigröße  : 473 bytes
Beschreibung: This is a digitally signed message part
URL         : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20171113/93b7f10c/attachment.sig>