X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=update_mobile_org;h=f154fbd7b702755b345f15f81ac8b7bcea1ccb33;hb=6624eff777ffe8ae30046d62897b131215475d11;hp=75cfc802e62d97b6869124df1ffa738a14bf0292;hpb=dfe71ff181038af4628ae5df4431d9cd0ff21669;p=bin.git

diff --git a/update_mobile_org b/update_mobile_org
index 75cfc80..f154fbd 100755
--- a/update_mobile_org
+++ b/update_mobile_org
@@ -1,12 +1,28 @@
 #!/bin/bash
 
+HOSTNAME=$(hostname)
 TMPDIR=~/tmp
 export TMPDIR
-. ~/.ssh/ssh_agent_info_$(hostname)
+. ~/.ssh/ssh_agent_info_${HOSTNAME}
 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 emacs --batch -l ~/.emacs -f 'org-mobile-push' -f 'org-mobile-pull'
-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" = "linnode" ]; 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" = "rzlab" ]; 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';