[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 1dd83e3bdc: Further improvements to admin/emake.
From: |
Gregory Heytings |
Subject: |
master 1dd83e3bdc: Further improvements to admin/emake. |
Date: |
Sat, 17 Sep 2022 05:38:11 -0400 (EDT) |
branch: master
commit 1dd83e3bdc54a0b235fa99536b15e52fe92fbc96
Author: Gregory Heytings <gregory@heytings.org>
Commit: Gregory Heytings <gregory@heytings.org>
Further improvements to admin/emake.
* admin/emake: Better parsing of script options. Add a --quieter option,
which removes everything except errors.
---
admin/emake | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/admin/emake b/admin/emake
index db4363a25b..e2f38501e9 100755
--- a/admin/emake
+++ b/admin/emake
@@ -20,9 +20,18 @@ if [ -f /proc/cpuinfo ]; then
sed 's/^[0-9]*/+/')))
fi
-[[ "X$1" == "X--no-color" ]] && { NOCOLOR=1; shift; } || NOCOLOR=0
-[[ "X$1" == "X--no-check" ]] && { NOCHECK=1; shift; } || NOCHECK=0
-[[ "X$1" == "X--no-fast" ]] && { FASTOPT=""; shift; } || FASTOPT="FAST=true"
+NOCOLOR=0
+NOCHECK=0
+FASTOPT="FAST=true"
+QUIETER=0
+while :
+do
+ [[ "X$1" == "X--no-color" ]] && { NOCOLOR=1; shift; continue; }
+ [[ "X$1" == "X--no-check" ]] && { NOCHECK=1; shift; continue; }
+ [[ "X$1" == "X--no-fast" ]] && { FASTOPT=""; shift; continue; }
+ [[ "X$1" == "X--quieter" ]] && { QUIETER=1; shift; continue; }
+ break
+done
make $FASTOPT -j$cores "$@" 2>&1 | \
sed -u 's# \.\./\.\./# #
@@ -106,7 +115,12 @@ do
C=""
(($NOCOLOR == 0)) && [[ "X${REPLY:0:1}" != "X " ]] && C="\033[1;31m"
(($NOCOLOR == 0)) && [[ "X${REPLY:0:3}" == "X " ]] && C="\033[1;31m"
- [[ "X$C" == "X" ]] && printf "%s\n" "$REPLY" || printf "$C%s\033[0m\n"
"$REPLY"
+ if (($QUIETER == 0))
+ then
+ [[ "X$C" == "X" ]] && printf "%s\n" "$REPLY" || printf "$C%s\033[0m\n"
"$REPLY"
+ else
+ [[ "X$C" == "X" ]] && printf "%-80s\r" "$REPLY" || printf
"$C%-80s\033[0m\n" "$REPLY"
+ fi
done
# If make failed, exit now with its error code.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 1dd83e3bdc: Further improvements to admin/emake.,
Gregory Heytings <=