X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/ac50469854a9a88ee23ab35e17707aecb881c29e..c3daaa72a1fe1262bac1d0f7e8d5416609eaab2e:/bin/mdw-build

diff --git a/bin/mdw-build b/bin/mdw-build
index 45ca7f8..09f99d5 100755
--- a/bin/mdw-build
+++ b/bin/mdw-build
@@ -184,12 +184,19 @@ case $jobs in 1) ;; *) makeopts="$makeopts -j$jobs" ;; esac
 ###--------------------------------------------------------------------------
 ### Utility functions.
 
-exec 3>&2 4>/dev/null 5>&2
+## File descriptor assignments:
+##
+##    0 -- original stdin (never touched)
+## 1, 2 -- stdout, stderr, redirected to 3 while running comamnds
+##  log -- logfile and original stderr (verbose), or logfile only (quiet);
+##		captures command output
+## diag -- logfile; primary diagnostic output
+## term -- orginal stderr; secondary diagnostic output (with colours)
 
 notify () {
   colour=$1 message=$2
-  echo $message >&4
-  echo "$(tput bold; tput setaf $colour)$message$(tput sgr0; tput op)" >&5
+  echo $message >&$diag
+  echo "$(tput bold; tput setaf $colour)$message$(tput sgr0; tput op)" >&$term
 }
 
 fail () {
@@ -215,18 +222,18 @@ assign () {
 
 runx () {
   notify 2 "+++ $*"
-  "$@" 2>&3 || fail "$1: exit $?"
+  nice "$@" 2>&$log {log}>&- {diag}>&- {term}>&- || fail "$1: exit $?"
 }
 
-run () { runx "$@" >&3; }
+run () { runx "$@" >&$log; }
 
 yesno () {
-  echo -n "(test $*)" >&4
-  if "$@" >&4 2>&4; then
-    echo "(yes)" >&4
+  echo -n "(test $*)" >&$diag
+  if "$@" >&$diag 2>&$diag {log}>&- {diag}>&- {term}>&-; then
+    echo "(yes)" >&$diag
     echo yes
   else
-    echo "(no)" >&4
+    echo "(no)" >&$diag
     echo no
   fi
 }
@@ -244,8 +251,7 @@ while [ ! -f configure.ac -a ! -f configure.in -a \
   esac
   cd ..
 done
-assign toppath $(pwd)
-assign srcpath $toppath
+toppath=$(pwd)
 
 ## Build any necessary qualifiers.
 qual= sep=.
@@ -255,19 +261,25 @@ case ${SBOX_SESSION_DIR+t},${DEB_BUILD_ARCH+t} in
 esac
 
 ## Construct the output directory.
-assign releasepath $srcpath/dist-$build$qual
+releasepath=$toppath/dist-$build$qual
 chmod -R +w $releasepath 2>/dev/null || :
 rm -rf $releasepath 2>/dev/null || :
 mkdir $releasepath
+logfile=$releasepath/mdw-build.log
+exec {term}>&2
+exec {diag}>>$logfile || fail "Failed to create log."
 case $verbose in
-  no)
-    exec 4>$releasepath/mdw-build.log 3>&4 ||
-      fail "Failed to create log."
-    ;;
+  no) exec {log}>&$diag ;;
+  yes) exec {log}> >(tee -a $logfile >&$term {term}>&- {diag}>&-) ;;
 esac
 
+## Repeat the earlier assignments for tbe benefit of the logfile.
+assign toppath $toppath
+assign releasepath $releasepath
+assign logfile $logfile
+
 ## Do we have a Git repository?
-case "$checkout,$setup,$(yesno [ -d $srcpath/.git ])" in
+case "$checkout,$setup,$(yesno [ -d $toppath/.git ])" in
   yes,no,*)
     fail "Inconsistent options: can't check out without setup."
     ;;
@@ -276,14 +288,14 @@ case "$checkout,$setup,$(yesno [ -d $srcpath/.git ])" in
     checkout=no gitver=none
     ;;
   yes,yes,yes)
-    cd $srcpath
+    cd $toppath
     [ "$(git ls-files -m)" = "" ] ||
       warn "working tree has uncommitted changes"
     ;;
 esac
 
 ## Is there Debian build equipment?
-case "$debian,$(yesno [ -d $srcpath/debian ])" in
+case "$debian,$(yesno [ -d $toppath/debian ])" in
   yes,no)
     info "No debian directory found."
     debian=no debver=none
@@ -302,7 +314,7 @@ esac
 case "$checkout" in
   yes)
     cd $releasepath
-    run git clone -sn $srcpath/.git _source
+    run git clone -sn $toppath/.git _source
     assign srcpath $releasepath/_source
     cd $srcpath
     run git update-ref refs/heads/mdw-build $checkoutrev ""
@@ -311,6 +323,9 @@ case "$checkout" in
     run git checkout-index -afu
     assign gitversion "$(git describe --abbrev=4)"
     ;;
+  no)
+    assign srcpath $toppath
+    ;;
 esac
 
 ## Check the version number.
@@ -366,10 +381,10 @@ esac
 cat >find-distdir.mk <<'EOF'
 include Makefile
 print-distdir:
-	@echo >&3 $(distdir)
+	@echo >&$(fd) $(distdir)
 EOF
 assign distdir \
-	$({ $make -f find-distdir.mk print-distdir >/dev/null 2>&1; } 3>&1)
+  $({ $make -f find-distdir.mk print-distdir fd=$t >/dev/null 2>&1; } {t}>&1)
 
 ## Get a tarball distribution.
 case "$distcheck" in