X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=update_org_ical;h=83237a7cc1139e6f33dca3c5094d0cc0b4c8a725;hb=dcce90e77c92202b5fadca48de6fd1cefc41ff79;hp=eebb11a50a8cf1e9a05e88ebafc9bc363cde9608;hpb=a4382288c9b8758879548a966d0ae35570b863ed;p=bin.git

diff --git a/update_org_ical b/update_org_ical
index eebb11a..83237a7 100755
--- a/update_org_ical
+++ b/update_org_ical
@@ -1,15 +1,29 @@
 #!/bin/bash
 
+HOSTNAME=$(hostname)
 TMPDIR=~/tmp
 export TMPDIR
-. ~/.ssh/ssh_agent_info_$(hostname)
+. ~/.ssh/ssh_agent_info_${HOSTNAME}
 LOCKOPTS=-q
 if [ -n "$PS1" ]; then
     LOCKOPTS=-f;
 fi;
-with-lock-ex $LOCKOPTS $TMPDIR/update_org_ical emacs --batch -l ~/.emacs \
+
+if [ "$HOSTNAME" = "rzlab" ]; then
+    with-lock-ex $LOCKOPTS $TMPDIR/update_org_ical timeout -k1m 1m mr -d ~/projects/org-notes up;
+else
+    with-lock-ex $LOCKOPTS $TMPDIR/update_org_ical timeout -k1m 1m emacsclient -n -e '(org-save-all-org-buffers)' >/dev/null 2>&1
+fi;
+yes|with-lock-ex $LOCKOPTS $TMPDIR/update_org_ical timeout -k1m 3m emacs --batch -l ~/.emacs \
+    --eval "(setq org-confirm-babel-evaluate nil)" \
     --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\")" \
-    --funcall 'org-icalendar-combine-agenda-files'
-with-lock-ex $LOCKOPTS $TMPDIR/update_org_ical rsync -av "$TMPDIR/org.ics" rzlab.ucr.edu:debian/.google_ical*/org.ics
+    --eval "(setq org-icalendar-exclude-tags '( \"habit\" ) )" \
+    --eval '(org-icalendar-combine-agenda-files)' \
+    --eval '(org-save-all-org-buffers)';
+if [ "$HOSTNAME" = "rzlab" ]; then
+    with-lock-ex $LOCKOPTS $TMPDIR/update_org_ical timeout -k1m 1m rsync -av "$TMPDIR/org.ics" debian/.google_ical*/org.ics
+else
+    with-lock-ex $LOCKOPTS $TMPDIR/update_org_ical timeout -k1m 1m rsync -av "$TMPDIR/org.ics" rzlab.ucr.edu:debian/.google_ical*/org.ics
+fi;