slitaz-base-files rev 132

libtaz.sh: cols are not set by stty in CGI or GTK and so better separator function
author Christophe Lincoln <pankso@slitaz.org>
date Fri Apr 13 13:39:20 2012 +0200 (2012-04-13)
parents 7ecb2e56a939
children 8e42240a9fd9
files rootfs/lib/libtaz.sh testsuite.sh
line diff
     1.1 --- a/rootfs/lib/libtaz.sh	Fri Apr 13 12:57:44 2012 +0200
     1.2 +++ b/rootfs/lib/libtaz.sh	Fri Apr 13 13:39:20 2012 +0200
     1.3 @@ -82,9 +82,13 @@
     1.4  
     1.5  # Line separator.
     1.6  separator() {
     1.7 -	sepchar="="
     1.8 -	[ "$HTTP_REFERER" ] && sepchar="<hr />"
     1.9 -	local cols=$(stty -a | head -n 1 | cut -d ";" -f 3 | awk '{print $2}')
    1.10 +	local sepchar="="
    1.11 +	[ "$HTTP_REFERER" ] && local sepchar="<hr />"
    1.12 +	case $output in
    1.13 +		raw|gtk) local sepchar="-" && local cols="8" ;;
    1.14 +		html) local sepchar="<hr />" ;;
    1.15 +		*) local cols=$(stty -a | head -n 1 | cut -d ";" -f 3 | awk '{print $2}') ;;
    1.16 +	esac
    1.17  	for c in $(seq 1 $cols); do
    1.18  		echo -n "$sepchar"
    1.19  	done && echo ""
     2.1 --- a/testsuite.sh	Fri Apr 13 12:57:44 2012 +0200
     2.2 +++ b/testsuite.sh	Fri Apr 13 13:39:20 2012 +0200
     2.3 @@ -14,7 +14,6 @@
     2.4  
     2.5  echo "Checking libtaz.sh: separator"
     2.6  separator
     2.7 -#check_root $@
     2.8  
     2.9  echo ""
    2.10  exit 0