X-Git-Url: http://git.tpope.net/?p=tpope-extra.git;a=blobdiff_plain;f=bin%2Faway-detect;h=72d83ff3c04d700173886d10ad66de4cf3d6eaab;hp=1d7575b0c612fc5553e0bd68c5806134a094ba29;hb=bc83d0e12d5f3a428a34c90b6acbbd072c7606c5;hpb=02cd3de48c08ae6f5d49caf24c1da5a2cd219d9a

diff --git a/bin/away-detect b/bin/away-detect
index 1d7575b..72d83ff 100755
--- a/bin/away-detect
+++ b/bin/away-detect
@@ -69,28 +69,30 @@ set_active() {
 
 now="$(expr 60 \* $(date +%H) + $(date +%M))"
 
-today --category='!school' | sed -e s/^..........//|grep '[0-9][0-9]:[0-9][0-9]-[0-9][0-9]:[0-9][0-9]'| \
+if today --category='holiday' | ! grep '' >/dev/null; then
+today --category='school' | sed -e s/^..........//|grep '[0-9][0-9]:[0-9][0-9]-[0-9][0-9]:[0-9][0-9]'| \
 while read times event; do
     begin="$(expr 60 \* $(echo $times|sed -e 's/-.*//' -e 's/:/ + /g'))"
     end="$(expr 60 \* $(echo $times|sed -e 's/.*-//' -e 's/:/ + /g'))"
     max_end="$end"
+    begin="`expr $begin - 15`"
+    end="`expr $begin / 2 + $end / 2`"
     if [ "$begin" -le "$now" -a "$now" -lt "$end" ]; then
-	echo "scheduled=\"$event\"" > "$HOME/.away-smart"
+	echo "scheduled=\"Class ($event)\"" > "$HOME/.away-smart"
 	break
     elif [ "$old_away" = "$event" -a "$now" -gt "$max_end" ]; then
 	echo "old_smart=\"$old_away\"" > "$HOME/.away-smart"
     fi
 done
+fi
 
-today --category='school' | sed -e s/^..........//|grep '[0-9][0-9]:[0-9][0-9]-[0-9][0-9]:[0-9][0-9]'| \
+today --category='!school' | sed -e s/^..........//|grep '[0-9][0-9]:[0-9][0-9]-[0-9][0-9]:[0-9][0-9]'| \
 while read times event; do
     begin="$(expr 60 \* $(echo $times|sed -e 's/-.*//' -e 's/:/ + /g'))"
     end="$(expr 60 \* $(echo $times|sed -e 's/.*-//' -e 's/:/ + /g'))"
     max_end="$end"
-    begin="`expr $begin - 15`"
-    end="`expr $begin / 2 + $end / 2`"
     if [ "$begin" -le "$now" -a "$now" -lt "$end" ]; then
-	echo "scheduled=\"Class ($event)\"" > "$HOME/.away-smart"
+	echo "scheduled=\"$event\"" > "$HOME/.away-smart"
 	break
     elif [ "$old_away" = "$event" -a "$now" -gt "$max_end" ]; then
 	echo "old_smart=\"$old_away\"" > "$HOME/.away-smart"