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 +//g' | \
- xargs -0 git commit -m'update org files'
+ sed -z 's/^ M[[:space:]]*//g' | \
+ 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 ~ -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;