Abstract out GIT_HOST

[bin.git] / update_org_files

diff --git a/update_org_files b/update_org_files
index 47d33bfb20113b955e66c8cfa03d154f93bec9e0..0e0f6ab27e11af1412c0b170fac3e2c17ea2adaf 100755 (executable)
--- a/update_org_files
+++ b/update_org_files
@@ -4,12 +4,14 @@ ORG_GREP='-e .org$ -e .org_archive$ -e .org_done$'
 
 if [ "x$1" == "xdoit" ]; 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//g' | \
+        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'
         git push;
-    fi; 
+    fi;
+    git pull;
 else
     emacsclient -n -e '(org-save-all-org-buffers)' >/dev/null 2>&1
-    mr -d ~ -j5 run update_org_files doit;
+    mr -d ~/projects/org-notes -j5 run update_org_files doit;
+    mr -d ~/org-mode -j5 run update_org_files doit;
 fi;