[Epfl-cvs] tgtools pictconvert,1.3,1.4

[Yohann C. <pl...@us...>]

Update of /cvsroot/epfl/tgtools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32105

Modified Files:
	pictconvert 
Log Message:
remodifs. en esperant que tout marche chez tout le monde...


Index: pictconvert
===================================================================
RCS file: /cvsroot/epfl/tgtools/pictconvert,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pictconvert	20 Nov 2004 10:12:13 -0000	1.3
--- pictconvert	20 Nov 2004 10:39:24 -0000	1.4
***************
*** 67,84 ****
  			file=`echo $1 | sed -e "s/\/$//"`
  
! 			let as=$(echo $file | wc -c)
! 			let fillsize=$(( ($TERMWIDTH - $as) / 2 ))
  			fill=""
! 			while [ "$fillsize" -gt "0" ]
  			do
  				fill="${fill} "
! 				let fillsize=${fillsize}-1
  			done
  			line=""
! 			let fillsize=$TERMWIDTH
! 			while [ "$fillsize" -gt "0" ]
  			do
  				line="${line}="
! 				let fillsize=${fillsize}-1
  			done
  			echo $line
--- 67,85 ----
  			file=`echo $1 | sed -e "s/\/$//"`
  
! 			string=$(echo $file | wc -c)
! #			let fillsize=$(( ($TERMWIDTH - $string) / 2 ))
! 			((fillsize=($TERMWIDTH-$string)/2))
  			fill=""
! 			while [ $fillsize -gt 0 ]
  			do
  				fill="${fill} "
! 				fillsize=$(($fillsize-1))
  			done
  			line=""
! 			fillsize=$TERMWIDTH
! 			while [ $fillsize -gt 0 ]
  			do
  				line="${line}="
! 				fillsize=$(($fillsize-1))
  			done
  			echo $line
***************
*** 146,157 ****
  				result="[PASS]"
  			fi
! 			let affichesize=$(echo $affiche | wc -c)
! 			let resultsize=$(echo $result | wc -c)
! 			let fillsize=${TERMWIDTH}-${affichesize}-${resultsize}-3
  			fill=""
  			while [ "$fillsize" -gt "0" ]
  			do
  				fill="${fill} "
! 				let fillsize=${fillsize}-1
  			done
  			echo "$affiche$fill$result"
--- 147,162 ----
  				result="[PASS]"
  			fi
! #			let affichesize=$(echo $affiche | wc -c)
! 			affichesize=$(echo $affiche | wc -c)
! #			let resultsize=$(echo $result | wc -c)
! 			resultsize=$(echo $result | wc -c)
! #			let fillsize=${TERMWIDTH}-${affichesize}-${resultsize}-3
! 			fillsize=$(($TERMWIDTH-$affichesize-$resultsize-3))
  			fill=""
  			while [ "$fillsize" -gt "0" ]
  			do
  				fill="${fill} "
! #				let fillsize=${fillsize}-1
! 				fillsize=$(($fillsize-1))
  			done
  			echo "$affiche$fill$result"