SliTaz Repositories

     1.1 --- a/rootfs/lib/libtaz.sh	Mon Apr 16 22:45:47 2012 +0200
     1.2 +++ b/rootfs/lib/libtaz.sh	Tue Apr 17 01:03:14 2012 +0200
     1.3 @@ -67,8 +67,8 @@
     1.4  		html)
     1.5  			done=" <span class='done'>$okmsg</span>" 
     1.6  			error=" <span class='error'>$ermsg</span>" ;;
     1.7 -		*) 
     1.8 -			local cols=$(stty -a -F /dev/pts/1 | head -n 1 | cut -d ";" -f 3 | awk '{print $2}')
     1.9 +		*)
    1.10 +			cols=$(stty -a -F /dev/stdin | head -n 1 | cut -d ";" -f 3 | awk '{print $2}')
    1.11  			local scol=$(($cols - 10))
    1.12  			done="\\033[${scol}G[ \\033[1;${okcolor}m${okmsg}\\033[0;39m ]"
    1.13  			error="\\033[${scol}G[ \\033[1;${ercolor}m${ermsg}\\033[0;39m ]" ;;
    1.14 @@ -87,7 +87,7 @@
    1.15  	case $output in
    1.16  		raw|gtk) local sepchar="-" && local cols="8" ;;
    1.17  		html) local sepchar="<hr />" ;;
    1.18 -		*) local cols=$(eval stty -a -F /dev/pts/1 | head -n 1 | cut -d ";" -f 3 | awk '{print $2}') ;;
    1.19 +		*) local cols=$(stty -a -F /dev/stdin | head -n 1 | cut -d ";" -f 3 | awk '{print $2}') ;;
    1.20  	esac
    1.21  	for c in $(seq 1 $cols); do
    1.22  		echo -n "$sepchar"

     2.1 --- a/testsuite.sh	Mon Apr 16 22:45:47 2012 +0200
     2.2 +++ b/testsuite.sh	Tue Apr 17 01:03:14 2012 +0200
     2.3 @@ -2,18 +2,24 @@
     2.4  #
     2.5  . rootfs/lib/libtaz.sh
     2.6  
     2.7 -echo -n "Checking libtaz.sh: status() 0"
     2.8 -status
     2.9 +check_libtaz() {
    2.10 +	echo -n "Checking libtaz.sh: status() 0"
    2.11 +	status
    2.12 +	
    2.13 +	echo -n "Checking libtaz.sh: status() 1"
    2.14 +	touch /tmp/1/2/2/4 2>/dev/null
    2.15 +	status
    2.16 +	
    2.17 +	echo -n "Checking libtaz.sh: boldify() "
    2.18 +	boldify "Message"
    2.19 +	
    2.20 +	echo "Checking libtaz.sh: separator"
    2.21 +	separator
    2.22 +}
    2.23  
    2.24 -echo -n "Checking libtaz.sh: status() 1"
    2.25 -touch /tmp/1/2/2/4 2>/dev/null
    2.26 -status
    2.27 -
    2.28 -echo -n "Checking libtaz.sh: boldify() "
    2.29 -boldify "Message"
    2.30 -
    2.31 -echo "Checking libtaz.sh: separator"
    2.32 -separator
    2.33 +check_libtaz
    2.34 +output="raw"
    2.35 +check_libtaz
    2.36  
    2.37  echo ""
    2.38  exit 0