use grep -s and other -z options

[bin.git] / update_org_files

diff --git a/update_org_files b/update_org_files
index b50ff08f7f78d2f44fe298cfbbb401ac0b64f5b9..47d33bfb20113b955e66c8cfa03d154f93bec9e0 100755 (executable)
--- a/update_org_files
+++ b/update_org_files
@@ -3,15 +3,13 @@
 ORG_GREP='-e .org$ -e .org_archive$ -e .org_done$'
 
 if [ "x$1" == "xdoit" ]; then
-    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 [ "$2" != "commit" ]; then
-            git push;
-        fi;
+    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'
+        git push;
     fi; 
 else
     emacsclient -n -e '(org-save-all-org-buffers)' >/dev/null 2>&1
     mr -d ~ -j5 run update_org_files doit;
 fi;
-
-