Holiday support

[tpope-extra.git] / bin / away-detect

diff --git a/bin/away-detect b/bin/away-detect
index 72d83ff3c04d700173886d10ad66de4cf3d6eaab..a3836e8d00a12ddc7b719d472c9722ac9ca1dabf 100755 (executable)
--- a/bin/away-detect
+++ b/bin/away-detect
@@ -69,8 +69,8 @@ set_active() {
 
 now="$(expr 60 \* $(date +%H) + $(date +%M))"
 
-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]'| \
+if ! today --category='holiday' | grep '' >/dev/null; then
+today --category='school' | sed -e s/^..........// -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'))"
@@ -80,7 +80,7 @@ while read times event; do
     if [ "$begin" -le "$now" -a "$now" -lt "$end" ]; then
        echo "scheduled=\"Class ($event)\"" > "$HOME/.away-smart"
        break
-    elif [ "$old_away" = "$event" -a "$now" -gt "$max_end" ]; then
+    elif [ "$old_away" = "Class ($event)" -a "$now" -gt "$max_end" ]; then
        echo "old_smart=\"$old_away\"" > "$HOME/.away-smart"
     fi
 done