more flexible timespec parsing

diff --git a/.mutt/get-timestamp b/.mutt/get-timestamp
index 5d00f321eaed9febce0e6730a7d307d403c32f28..919936aab81af22ff937b7ae20d95e01945cecac 100755 (executable)
--- a/.mutt/get-timestamp
+++ b/.mutt/get-timestamp
@@ -15,18 +15,19 @@ printf 'When should I tickle you about this message? ' >/dev/tty
 read timespec </dev/tty
 
 case "$timespec" in
 read timespec </dev/tty
 
 case "$timespec" in

+  '')
+    echo "E: empty timespec" >&2
+    exit 1
+    ;;

   @[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]|*' '*)
     date="$timespec";;
   *[0-9]y) date="now + ${timespec%y} years 00:00";;
   *[0-9]m) date="now + ${timespec%m} months 00:00";;
   *[0-9]w) date="now + ${timespec%w} weeks 00:00";;
   @[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]|*' '*)
     date="$timespec";;
   *[0-9]y) date="now + ${timespec%y} years 00:00";;
   *[0-9]m) date="now + ${timespec%m} months 00:00";;
   *[0-9]w) date="now + ${timespec%w} weeks 00:00";;

-  *[0-9]d) date="now + ${timespec%d} days 00:00";;
+  *[0-9]d|*[0-9]) date="now + ${timespec%d} days 00:00";;

   *[0-9]h) date="now + ${timespec%h} hours";;
   *[0-9]h) date="now + ${timespec%h} hours";;

-  *[!0-9]*) 
-    echo "E: invalid timespec: $timespec" >&2
-    exit 1
-    ;;
-  *) date="now + $timespec days 00:00";;
+  *' '*) date="$args";;
+  *) date="$timespec";;

 esac
 
 exec date +'%s (%c)' -d "$date"
 esac
 
 exec date +'%s (%c)' -d "$date"