X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=update_org_files;h=0e0f6ab27e11af1412c0b170fac3e2c17ea2adaf;hb=dcce90e77c92202b5fadca48de6fd1cefc41ff79;hp=807cb7bb27ad711a14f887549d7c340674eb951e;hpb=a774159e50afae973d8bc99ef417a82eace83f5d;p=bin.git diff --git a/update_org_files b/update_org_files index 807cb7b..0e0f6ab 100755 --- a/update_org_files +++ b/update_org_files @@ -5,11 +5,13 @@ 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' | \ + 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;