X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=update_org_files;h=0e0f6ab27e11af1412c0b170fac3e2c17ea2adaf;hb=56c8d8b286ae38e170ce915472f9aa86fabf9fee;hp=3c71d1558e16c16701fa37901a6e9cf5820df39c;hpb=96c6760a82404074d81d044ecfd691b154dca092;p=bin.git diff --git a/update_org_files b/update_org_files index 3c71d15..0e0f6ab 100755 --- a/update_org_files +++ b/update_org_files @@ -2,17 +2,16 @@ 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_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; +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[[:space:]]*//g' | \ + xargs -0 git commit -m'update org files' + git push; + fi; + git pull; +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; +fi;