bugfix: octal interpretation of events at 8am and 9am, suppress calender error when...

diff --git a/macros/calendar b/macros/calendar
index a8f8dd649019e4b38daf8ab8e73b374684d47745..b56784cee6203720c75154f099b35e31b9ade50c 100755 (executable)
--- a/macros/calendar
+++ b/macros/calendar
@@ -43,7 +43,7 @@ while [ $# -gt 0 ]; do case $1 in
     fi;;
 esac; done
 
-[ "$*" ] || set -- "*"
+[ "$*" ] || set -- "."
 [ "$depth" -ge 0 -o "$depth" -le 0 ] 2>&- || depth=0
 
 read DY DM DD <<-EOF
@@ -68,6 +68,7 @@ rrexpand() {
   local junk1 start end rrfreq rrint rrend evtitle evlink junk2
 
   while read -r junk1 start end rrfreq rrint rrend evtitle evlink junk2; do
+    [ ! "$start" ] && continue  # empty line
     [ "$rrend" -eq -1 ] && rrend=9999999999
 
     if [ "$start" -lt "$dend" ] &&
@@ -274,7 +275,6 @@ cal_month() {
   dcnt=$((iday - idow * 86400 + ws * 86400))
    dow=$ws
   dcal="$(date -ud @"$dcnt" +%d)"
-
   events="$(
     printf %s\\n "$events" \
     | rrexpand "$dcnt" "$((dcnt + 42 * 86400))" \

diff --git a/macros/event b/macros/event
index 4b3881057713f9edeb59abbbebe78544f3f20889..0ca81afba7e6ac2e79e0d26b34b602bcd25793be 100755 (executable)
--- a/macros/event
+++ b/macros/event
@@ -105,8 +105,13 @@ if [ ! "$end_time" ]; then
   end_time="23:59"
 fi
 
+shh=${start_time%:*} shh="${shh#0}"
+smm=${start_time#*:} smm="${smm#0}"
+ehh=${end_time%:*}   ehh="${ehh#0}"
+emm=${end_time#*:}   emm="${emm#0}"
+
 if [ ! "$end_date" -a "$end_time" -a "$start_time" ]; then
-  if [ "$((${end_time%:*} * 60 + ${end_time#*:}))" -gt "$((${start_time%:*} * 60 + ${start_time#*:}))" ]; then
+  if [ "$((ehh * 60 + emm))" -gt "$((shh * 60 + smm))" ]; then
     end_date="$start_date"
   else
     end_date="$(date -ud "@$(($(date -ud "$start_date" +%s) + 86400))" +%F)"