X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=update_org_files;h=668f7e95078ab71d8d366f51de2c04fdf66933b2;hb=HEAD;hp=2b2692d03761f82ef13584f77f842eaa645d7984;hpb=829ddbc623f19d45d5ea2c1f73b8081d4ca8ba13;p=bin.git

diff --git a/update_org_files b/update_org_files
index 2b2692d..d93a40b 100755
--- a/update_org_files
+++ b/update_org_files
@@ -2,15 +2,24 @@
 
 ORG_GREP='-e .org$ -e .org_archive$ -e .org_done$'
 
-if [ "x$1" == "xdoit" ]; then
+COMMIT_MESSAGE="${1:-update org files}"
+
+if [ "x$UPDATE_ORG_REALLY_DO_IT" == "xyesdoit" ]; then
     if git status --porcelain -z | grep -z '^ M' | grep -zq $ORG_GREP; then
         git status --porcelain -z | grep -z '^ M' | grep -z $ORG_GREP | \
             sed -z 's/^ M[[:space:]]*//g' | \
-            xargs -0 git commit -m'update org files'
+            xargs -0 git commit -m"$COMMIT_MESSAGE"
+        git pull --rebase;
         git push;
-    fi; 
+    else
+        git pull --rebase;
+    fi;
 else
-    emacsclient -n -e '(org-save-all-org-buffers)' >/dev/null 2>&1
-    mr -d ~/projects/org-notes -j5 run update_org_files doit;
-    mr -d ~/org-mode -j5 run update_org_files doit;
+    if [ "x$NO_SAVE_ORG_BUFFERS" == "x" ]; then
+        emacsclient -n -e '(org-save-all-org-buffers)' >/dev/null 2>&1
+    fi;
+    UPDATE_ORG_REALLY_DO_IT="yesdoit" mr -d ~/projects/org-notes -j5 run \
+                           update_org_files "$COMMIT_MESSAGE"
+    UPDATE_ORG_REALLY_DO_IT="yesdoit" mr -d ~/org-mode -j5 run \
+                           update_org_files "$COMMIT_MESSAGE";
 fi;