Updates

1 files changed, 10 insertions, 6 deletions

diff --git a/.local/bin/status/sb-forecast b/.local/bin/status/sb-forecast
index 0f7aa52..0ac1a40 100755
--- a/.local/bin/status/sb-forecast
+++ b/.local/bin/status/sb-forecast
@@ -1,18 +1,22 @@
 #!/bin/sh
 
 weatherreport="/tmp/weatherreport"
+weatherglyph="/tmp/weatherglyph"
+moonreport="/tmp/moonglyph"
 
 getweather() {
-	curl -sf "wttr.in/lyon" >$weatherreport || exit 1
+	curl -sf "wttr.in/Lyon" >$weatherreport || exit 1
+	curl -sf "wttr.in/Lyon?format=%c" >$weatherglyph || exit 1
+	curl -sf "wttr.in/Lyon?format=%m" >$moonglyph || exit 1
 }
 
 [ -f $weatherreport ] && [ "$(gnustat -c %y "$weatherreport" 2>/dev/null | cut -d' ' -f1)" = "$(date '+%Y-%m-%d')" ] || getweather
 
-printf "%s" "$(sed '16q;d' "$weatherreport" |
-grep -wo "[0-9]*%" | sort -rn | sed "s/^/  /g;1q" | tr -d '\n')"
+printf "%s  %s" \
+	"$(cat $weatherglyph)" \
+	"$(sed '16q;d' "$weatherreport" | grep -wo "[0-9]*%" | sort -rn | sed "s/^/ /g;1q" | tr -d '\n')"
 
+moon=$(cat $moonreport)
 sed '13q;d' "$weatherreport" | grep -o "m\\([-+]\\)*[0-9]\\+" | sed 's/+//g' |
 	sort -n -t 'm' -k 2n | sed -e 1b -e '$!d' | tr '\n|m' ' ' |
-	awk '{print " ﰕ " $1 "°C","  " $2 "°C"}'
-
-# weatherreport="${XDG_CACHE_HOME:-$HOME/.cache}/weatherreport"
+	awk -v moon=$moon '{print " ﰕ " $1 "°C","  " $2 "°C " moon}'