From 1fe52f1da7ba2febeb038be420a3a999488ca8d6 Mon Sep 17 00:00:00 2001 From: Storm dragon Date: Sat, 26 Mar 2016 09:54:09 -0400 Subject: [PATCH] Yahoo weather api went stupid. Sorry if this screwes over your temperature alerts, but I had to switch away from it. Now using weatherunderground. --- src/talking-clock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/talking-clock b/src/talking-clock index d695b8c..09e079e 100755 --- a/src/talking-clock +++ b/src/talking-clock @@ -359,9 +359,9 @@ if [ "$speakTime" == "true" ] ; then #Add temperature if zipcode is set if [ -n "$zipcode" ] ; then if [ "$torify" == "true" ] ; then - temperature="$(torify curl -s "http://weather.yahooapis.com/forecastrss?p=${zipcode}&u=f" | grep -A 1 "Current Conditions:" | tr -Cd '[:digit:]-')" + temperature="$(torify curl -s "http://mobile.wunderground.com/cgi-bin/findweather/getForecast?brand=mobile&query=${zipcode}" | grep -A 2 'Temperature' | tr -cd '[:digit:]-.' | cut -d . -f1)" else - temperature="$(curl -s "http://weather.yahooapis.com/forecastrss?p=${zipcode}&u=f" | grep -A 1 "Current Conditions:" | tr -Cd '[:digit:]-')" + temperature="$(curl -s "http://mobile.wunderground.com/cgi-bin/findweather/getForecast?brand=mobile&query=${zipcode}" | grep -A 2 'Temperature' | tr -cd '[:digit:]-.' | cut -d . -f1)" fi if [ -n "$temperature" ] ; then if [ "$format" = "24" ]; then @@ -425,7 +425,7 @@ fi #There will be a slight gap between the prepended sound and the actual chiming. #This is to simulate real clocks based on my experience. if [ "$minute" -eq "0" ]; then - if [[ -f "$soundPack/prepend.ogg" -a "$chime" = "true" ]]; then + if [[ -f "$soundPack/prepend.ogg" && "$chime" = "true" ]]; then $soundCommand "$soundPack/prepend.ogg" fi fi