weather scripts integrated

1 files changed, 15 insertions, 6 deletions

diff --git a/.scripts/statusbar/weather b/.scripts/statusbar/weather
index 54c2a43..9244dbc 100755
--- a/.scripts/statusbar/weather
+++ b/.scripts/statusbar/weather
@@ -1,15 +1,24 @@
 #!/bin/sh
-[ "$(stat -c %y /tmp/weatherreport | awk '{print $1}')" != "$(date '+%Y-%m-%d')" ] && getforecast
+location="$1"; [ -z "$location" ] || location="$location+"
+
+getforecast() { ping -q -c 1 1.1.1.1 >/dev/null || exit 1
+curl -s "wttr.in/$location" > "$HOME/.local/share/weatherreport" || exit 1 ;}
+
+showweather() { printf "%s" "$(sed '16q;d' "$HOME/.local/share/weatherreport" | grep -wo "[0-9]*%" | sort -n | sed -e '$!d' | sed -e "s/^/☔ /g" | tr -d '\n')"
+sed '13q;d' "$HOME/.local/share/weatherreport" | grep -o "m\\(-\\)*[0-9]\\+" | sort -n -t 'm' -k 2n | sed -e 1b -e '$!d' | tr '\n|m' ' ' | awk '{print " ❄️",$1 "°","🌞",$2 "°"}' ;}
 
 case $BLOCK_BUTTON in
-    1) $TERMINAL -e less -S -R /tmp/weatherreport ;;
+    1) $TERMINAL -e less -S "$HOME/.local/share/weatherreport" ;;
+    2) getforecast && showweather ;;
     3) pgrep -x dunst >/dev/null && notify-send "<b>🌈 Weather module:</b>
-- Click for wttr.in forecast.
+- Left click for full forecast.
+- Middle click to update forecast.
 ☔: Chance of rain/snow
 ❄: Daily low
 🌞: Daily high" ;;
 esac
 
-printf "%s" "$(sed '16q;d' /tmp/weatherreport | grep -wo "[0-9]*%" | sort -n | sed -e '$!d' | sed -e "s/^/☔ /g" | tr -d '\n')"
-
-sed '13q;d' /tmp/weatherreport | grep -o "m\\(-\\)*[0-9]\\+" | sort -n -t 'm' -k 2n | sed -e 1b -e '$!d' | tr '\n|m' ' ' | awk '{print " ❄️",$1 "°","🌞",$2 "°"}'
+if [ "$(stat -c %y "$HOME/.local/share/weatherreport" | awk '{print $1}')" != "$(date '+%Y-%m-%d')" ]
+	then getforecast && showweather
+	else showweather
+fi