File weather.sh.patch of Package conkyweather

Overview Repositories Revisions Requests Users Attributes Meta

File weather.sh.patch of Package conkyweather (Revision 47236aa7b5644d1080eb1cc7f330c42c)

Currently displaying revision 47236aa7b5644d1080eb1cc7f330c42c , Show latest

--- ./weather.sh.orig	2012-05-25 01:14:03.025093656 -0700
+++ ./weather.sh	2012-05-25 01:13:18.000000000 -0700
@@ -29,11 +29,13 @@
 CONDITIONS=$2
 #echo $CONDITIONS
 
+WEATHER_XML=$3
+
 # s=standard units, m=metric units
 UNITS=m
 
 # where this script and the XSLT lives
-RUNDIR=`dirname $0` 
+RUNDIR=/usr/share/conkyweather 
 
 # there's probably other stuff besides CURL that will work for this, but i haven't 
 # tried any others. 
@@ -47,13 +49,12 @@
 
 # CURL url. Use cc=* for current forecast or dayf=10 to get a multi-day forecast
 #CURLURL="http://xoap.weather.com/weather/local/$LOCID?cc=*&unit=$UNITS&dayf=4"
-CURLURL="http://www.google.com/ig/api?weather=${LOCID}"
+CURLURL="http://www.google.com/ig/api?weather=${LOCID}&oe=utf-8"
 
-weather_xml="${RUNDIR}/weatherInfo.xml"
+weather_xml=${WEATHER_XML:-$HOME/weatherInfo.xml} 
 # don't get the file  if created within an hour
 update=3600
 
-
 #######
 #   Optimization. 
 #   We cache the xml in a file and don't get the file
@@ -91,6 +92,7 @@
 }
 
 
+get_file
 
 
 # The XSLT to use when translating the response from weather.com
@@ -107,12 +109,29 @@
 elif [ "$CONDITIONS" = "ct" ];
 then
     XSLT=$RUNDIR/currentTemp.xslt
+elif [ "$CONDITIONS" = "ctF" ];
+then
+    XSLT=$RUNDIR/currentTempF.xslt
+elif [ "$CONDITIONS" = "ch" ];
+then
+    XSLT=$RUNDIR/currentHumidity.xslt
+	eval "$XSLTCMD  $XSLT $weather_xml" | sed 's|^.*: *||'
+	exit
+elif [ "$CONDITIONS" = "cw" ];
+then
+    XSLT=$RUNDIR/currentWind.xslt
+	eval "$XSLTCMD  $XSLT $weather_xml" | sed 's|^.*: *||'
+	exit
 elif [ "$CONDITIONS" = "cc" ];
 then
     XSLT=$RUNDIR/currentCondition.xslt
 elif [ "$CONDITIONS" = "fct" ];
 then
     XSLT=$RUNDIR/fcTemp.xslt
+
+elif [ "$CONDITIONS" = "fctF" ];
+then
+    XSLT=$RUNDIR/fcTempF.xslt
 else
     XSLT=$RUNDIR/weather.xslt 
 fi
@@ -121,7 +140,6 @@
 #(if you want to convert stuff to lower-case or upper case or something)
 #FILTER="|gawk '{print(tolower(\$0));}'"
 
-get_file
 
 
 #####

Places

File weather.sh.patch of Package conkyweather (Revision 47236aa7b5644d1080eb1cc7f330c42c)

Places