Merge branch 'master' of git+ssh://git.donarmstrong.com/srv/git/bin

[bin.git] / update_mobile_org

diff --git a/update_mobile_org b/update_mobile_org
index 75cfc802e62d97b6869124df1ffa738a14bf0292..f1c98e87f31def9fe221b097278b7f7aa78c543a 100755 (executable)
--- a/update_mobile_org
+++ b/update_mobile_org
@@ -7,6 +7,8 @@ LOCKOPTS=-q
 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';
+mr -d ~/org-mode up;
+with-lock-ex $LOCKOPTS $TMPDIR/update_mobile_org timeout -k1m 1m emacsclient -n -e '(org-save-all-org-buffers)' >/dev/null 2>&1
+yes|with-lock-ex $LOCKOPTS $TMPDIR/update_mobile_org timeout -k1m 5m 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';