better logging, clearer options

diff --git a/emacs b/emacs
index a575e614f0d98691cb40a41f91343d62194d6b8d..a91b708f22f373b0175523b22787987848641eb5 100755 (executable)
--- a/emacs
+++ b/emacs
@@ -16,7 +16,7 @@
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
 
-set -x
+#set -x
 # arg = git commit to check out
 # -r = don't recompile from scratch
 # -u = update sources
@@ -27,12 +27,14 @@ recompile=true
 
 while [[ $1 == -* ]]; do
     case $1 in
-        -r) recompile=false; shift ;;
+        --no-r) recompile=false; shift ;;
         -u) update=true; shift ;;
         --) break ;;
     esac
 done
 
+e() { echo "$@"; "$@"; }
+
 export CFLAGS="-Og -g3"
 
 # gawk and attr were no longer automatically installed in stretch
@@ -87,12 +89,12 @@ if $recompile; then
 
     # git version
     if [[ $1 ]]; then
-        i clean -xxxfd
+        e i clean -xxxfd
     elif $update; then
-        i fetch
-        i clean -xxxffd
-        i reset --hard origin/master
-        i clean -xxxffd
+        e i fetch
+        e i clean -xxxffd
+        e i reset --hard origin/master
+        e i clean -xxxffd
     fi
 
     # autogen is usually only for the first build, assume it works
@@ -121,7 +123,7 @@ s lnf /usr/local/bin/emacs /usr/bin
 
 logq emacs --batch -l ~/.emacs.d/init.el -l ~/.emacs.d/compile-init-dir.el
 
-# not keeping up with the latest org-mode development
+# not keeping up with the latest org-mode development anymore
 #~/bin/buildscripts/org-mode
 
 if $update; then