use timeout

diff --git a/update_org_ical b/update_org_ical
index 0d5422e513d88acf39f302a04099b25c16108334..84b57a79ec22100387a7b15d851919c50ad56399 100755 (executable)
--- a/update_org_ical
+++ b/update_org_ical
@@ -7,12 +7,12 @@ LOCKOPTS=-q
 if [ -n "$PS1" ]; then
     LOCKOPTS=-f;
 fi;
-with-lock-ex $LOCKOPTS $TMPDIR/update_org_ical emacsclient -n -e '(org-save-all-org-buffers)' >/dev/null 2>&1
-yes|with-lock-ex $LOCKOPTS $TMPDIR/update_org_ical emacs --batch -l ~/.emacs \
+with-lock-ex $LOCKOPTS $TMPDIR/update_org_ical timeout -k1m 1m emacsclient -n -e '(org-save-all-org-buffers)' >/dev/null 2>&1
+yes|with-lock-ex $LOCKOPTS $TMPDIR/update_org_ical timeout -k1m 3m emacs --batch -l ~/.emacs \
     --eval '(setq org-icalendar-combined-description "Don Armstrong’s Calendar (org-mode)")' \
     --eval '(setq org-icalendar-combined-name "Don Armstrong (org-mode)")' \
     --eval "(setq org-icalendar-combined-agenda-file \"$TMPDIR/org.ics\")" \
     --eval "(setq org-icalendar-exclude-tags '( \"habit\" ) )" \
     --eval '(org-icalendar-combine-agenda-files)' \
     --eval '(org-save-all-org-buffers)';
-with-lock-ex $LOCKOPTS $TMPDIR/update_org_ical rsync -av "$TMPDIR/org.ics" rzlab.ucr.edu:debian/.google_ical*/org.ics
+with-lock-ex $LOCKOPTS $TMPDIR/update_org_ical timeout -k1m 1m rsync -av "$TMPDIR/org.ics" rzlab.ucr.edu:debian/.google_ical*/org.ics