Add period to names

diff --git a/bin/away-detect b/bin/away-detect
index 72d83ff3c04d700173886d10ad66de4cf3d6eaab..cd0ba17986c1e0ce0523045c5f4053ad5f9a21e1 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'))"
@@ -86,18 +86,18 @@ while read times event; do
 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]'| \
-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"
-    if [ "$begin" -le "$now" -a "$now" -lt "$end" ]; then
-       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"
-    fi
-done
+#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"
+#    if [ "$begin" -le "$now" -a "$now" -lt "$end" ]; then
+#      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"
+#    fi
+#done
 
 [ -f "$HOME/.away-smart" ] && . "$HOME/.away-smart"
 old_sched="$scheduled"

diff --git a/perl/sctweb b/perl/sctweb
index 8c1edefb4edf63d5777843505bbe2d0f6ca4aa0a..c32a30fb44fbba43e50d65ad49dee6657674068c 100755 (executable)
--- a/perl/sctweb
+++ b/perl/sctweb
@@ -134,6 +134,7 @@ sub do_html_schedule {
            $row->[0] =~ s/.*launchWebCT\("([^"]*)"\).*/$1/s;
            $row->[0] =~ s/ <BR>(.*)/"<br \/>" . capitalize($1)/eg;
            $row->[1] = capitalize($row->[1]);
+           $row->[1] =~ s/([A-Z]r?)$/$1./;
            $row->[3] =~ s/-/-<wbr \/>/g;
            $row->[5] =~ s/ON CAMPUS<br \/>//g;
            $row->[5] =~ s/<br \/>/ /g;