[Tuxaator-commits] tuxaator/scripts ee-ilm.sh,1.3,1.4

[Andres S. <di...@us...>]

Update of /cvsroot/tuxaator/tuxaator/scripts
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8857

Modified Files:
	ee-ilm.sh 
Log Message:
updated the weather data fetching script

Index: ee-ilm.sh
===================================================================
RCS file: /cvsroot/tuxaator/tuxaator/scripts/ee-ilm.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ee-ilm.sh	21 Dec 2003 21:02:51 -0000	1.3
--- ee-ilm.sh	2 Jun 2006 03:27:02 -0000	1.4
***************
*** 1,9 ****
  #!/bin/sh
  tallinn=`/bin/nc 193.40.240.131 6340 |grep temp|cut -d" " -f3| tr -s + " "|tr -s "'" " "|cut -d" " -f1-`
  tartu=`/usr/bin/lynx -dump http://meteo.physic.ut.ee/et/frontmain.php?m=2 |grep Temp|tr -s " " " "|cut -d " " -f3`
! viljandi=`/usr/bin/lynx -dump http://nadal.viljandi.ee/ |grep Temperatuur:|tr -s " " " "|cut -d " " -f3`
  parnu=`/usr/bin/lynx -dump http://ilm.transcom.ee/mobile.aspx | grep Õhk | cut -d " " -f6 | tr  "," "."`
  tm=`date +"%H:%M"`
! echo  "kell $tm; Tallinn:$tallinn; Tartu: $tartu C; Viljandi: $viljandi C; Pärnu: $parnu C"
  #echo  "Tallinn: $tallinn"
  #echo -n "Tallinn:"; lynx -source http://www.ilm.ee/~data/tallinn/temp
--- 1,14 ----
  #!/bin/sh
  tallinn=`/bin/nc 193.40.240.131 6340 |grep temp|cut -d" " -f3| tr -s + " "|tr -s "'" " "|cut -d" " -f1-`
+ #tallinn=`lynx -source http://www.ilm.ee/~data/tallinn/temp` # temporary
+ 
  tartu=`/usr/bin/lynx -dump http://meteo.physic.ut.ee/et/frontmain.php?m=2 |grep Temp|tr -s " " " "|cut -d " " -f3`
! #viljandi=`/usr/bin/lynx -dump http://nadal.viljandi.ee/ |egrep '(Temperatuur|K.lma):' |tr -s " " " "|cut -d " " -f3`
! viljandi=`curl -s http://www.matti.ee/~nilm/temp`
  parnu=`/usr/bin/lynx -dump http://ilm.transcom.ee/mobile.aspx | grep Õhk | cut -d " " -f6 | tr  "," "."`
  tm=`date +"%H:%M"`
! rapina=`curl -s http://www.jes.ee/temp/temp.txt | perl -Te '$_ = <>; exit unless m/^\s*([+-]?\d+\.\d)\d*\s*$/; print $1'`
! saue=`curl -s http://ketas.life.ee/temp.saue | perl -Te '$_ = <>; exit unless m/^([+-]?\d+)\b/; print $1'`
! echo  "kell $tm; Tallinn:$tallinn; Tartu: $tartu C; Viljandi: $viljandi C; Pärnu: $parnu C; Räpina: $rapina C; Saue: $saue C"
  #echo  "Tallinn: $tallinn"
  #echo -n "Tallinn:"; lynx -source http://www.ilm.ee/~data/tallinn/temp