save org mode buffers before calling update_org_files and update_org_ical

[bin.git] / update_org_files

diff --git a/update_org_files b/update_org_files
index d7cec3e3712c3ccef6bb1a37df44f27ef2f1e7f9..3c71d1558e16c16701fa37901a6e9cf5820df39c 100755 (executable)
--- a/update_org_files
+++ b/update_org_files
@@ -1,12 +1,18 @@
 #!/bin/bash
 
+ORG_GREP='-e .org$ -e .org_archive$ -e .org_done$'
+
 cd ~;
 
+emacsclient -n -e '(org-save-all-org-buffers)' >/dev/null 2>&1
+
 for a in $(mr list |grep 'list:'|grep -v 'finished'|awk -F'list: ' '{print $2}' 2>/dev/null); do 
     (cd "$a";
-    if git status --porcelain|grep '^ M'|grep -q '.org$'; then
-          git commit -m'update org files' $(mr --no-recurse status |grep '^ M'|grep '.org$'|sed 's/^ M//g');
-          git push;
+    if git status --porcelain|grep '^ M'|grep -q $ORG_GREP; then
+          git commit -m'update org files' $(mr --no-recurse status |grep '^ M'|grep $ORG_GREP|sed 's/^ M//g');
+          if [ "$1" != "commit" ]; then
+              git push;
+          fi;
        fi; 
     );
 done;