X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=update_mobile_org;h=b124ffd9ea8b1de85fe248864710e6ea4cec5fd8;hb=dcce90e77c92202b5fadca48de6fd1cefc41ff79;hp=4078d68e2e2f7eb108d3f159914a2ff649006f10;hpb=4e4d0882988c7533a9a652759810064b8202d038;p=bin.git

diff --git a/update_mobile_org b/update_mobile_org
index 4078d68..b124ffd 100755
--- a/update_mobile_org
+++ b/update_mobile_org
@@ -1,14 +1,32 @@
 #!/bin/bash
 
+GIT_HOST="linnode"
+
+HOSTNAME=$(hostname)
 TMPDIR=~/tmp
 export TMPDIR
-. ~/.ssh/ssh_agent_info_$(hostname)
+if [ -e ~/.ssh/ssh_agent_info_${HOSTNAME} ]; then
+    . ~/.ssh/ssh_agent_info_${HOSTNAME}
+fi;
 LOCKOPTS=-q
+LOCKFILE=$TMPDIR/update_mobile_org
 if [ -n "$PS1" ]; then
     LOCKOPTS=-f;
 fi;
-mr -d ~/org-mode up;
-with-lock-ex $LOCKOPTS $TMPDIR/update_mobile_org emacsclient -n -e '(org-save-all-org-buffers)' >/dev/null 2>&1
-with-lock-ex $LOCKOPTS $TMPDIR/update_mobile_org emacs --batch -l ~/.emacs \
-    --eval '(org-mobile-push)' --eval '(org-mobile-pull)' --eval '(org-save-all-org-buffers)';
-mr -d ~/org-mode commit -m'org mobile automated commit and push';
+LOCKIT="with-lock-ex $LOCKOPTS $LOCKFILE"
+TIMEOUT="timeout -k1m 1m"
+${LOCKIT} ${TIMEOUT} mr -d ~/org-mode up;
+if [ "$HOSTNAME" = "$GIT_HOST" ]; then
+    ${LOCKIT} ${TIMEOUT} mr -d ~/projects/org-notes up;
+else
+    ${LOCKIT} ${TIMEOUT} emacsclient -n -e '(org-save-all-org-buffers)' >/dev/null 2>&1;
+fi;
+yes|${LOCKIT} timeout -k1m 5m emacs --batch -l ~/.emacs \
+                 --eval '(org-mobile-push)' --eval '(org-mobile-pull)' --eval '(org-save-all-org-buffers)';
+
+if [ "$HOSTNAME" = "$GIT_HOST" ]; then
+    ${LOCKIT} ${TIMEOUT} \
+                 mr -d ~/projects/org-notes commit -m'org mobile automated commit and push';
+fi;
+${LOCKIT} ${TIMEOUT} \
+          mr -d ~/org-mode commit -m'org mobile automated commit and push';