diff --git a/scripts/weather.sh b/scripts/weather.sh index 985af91..b5bf371 100755 --- a/scripts/weather.sh +++ b/scripts/weather.sh @@ -5,77 +5,58 @@ fahrenheit=$1 load_request_params() { - city=$(curl -s https://ipinfo.io/city 2> /dev/null) region=$(curl -s https://ipinfo.io/region 2> /dev/null) - zip=$(curl -s https://ipinfo.io/postal 2> /dev/null | tail -1) - country_w_code=$(curl -w "\n%{http_code}\n" -s https://ipinfo.io/country 2> /dev/null) - country=`grep -Eo [a-zA-Z]+ <<< "$country_w_code"` - exit_code=`grep -Eo [0-9]{3} <<< "$country_w_code"` - - region_code_url=http://www.ip2country.net/ip2country/region_code.html - weather_url=https://forecast.weather.gov/zipcity.php } -#substitute region code for regions in north america -get_region_code() + +fetch_weather_information() { - curl -s $region_code_url | grep $region &> /dev/null && region=$(curl -s $region_code_url | grep $region | cut -d ',' -f 2) - echo $region + display_weather=$1 + # it gets the weather condition textual name (%C), the temperature (%t), and the location (%l) + curl -sL curl wttr.in\?format="+%C+%t$display_weather" } -weather_information() -{ - curl -sL $weather_url?inputstring=$zip | grep myforecast-current | grep -Eo '>.*<' | sed -E 's/>(.*)/dev/null; then - echo "$(display_weather)$city, $(get_region_code)" + echo "$(display_weather) $city, $region" else echo "Location Unavailable" fi