diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-07-22 23:07:55 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-08-02 07:44:29 +0200 |
| commit | e027330751dd78225bd01ad11013d1a0c14f4467 (patch) | |
| tree | dfde951c6daa44d21516ba71d2d0a72c24a42a50 /scripts/libptxdist.sh | |
| parent | c3db70352b9f41722693edb7e117f19a3c800171 (diff) | |
| download | ptxdist-e027330751dd78225bd01ad11013d1a0c14f4467.tar.gz ptxdist-e027330751dd78225bd01ad11013d1a0c14f4467.tar.xz | |
[ptxd_make_log] unify quiet and non quiet mode
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'scripts/libptxdist.sh')
| -rw-r--r-- | scripts/libptxdist.sh | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/scripts/libptxdist.sh b/scripts/libptxdist.sh index 7a8bc5f2a..4c64559ca 100644 --- a/scripts/libptxdist.sh +++ b/scripts/libptxdist.sh @@ -348,28 +348,26 @@ ptxd_make() { # supress stdout in quiet mode # ptxd_make_log() { - if [ -z "${PTXDIST_QUIET}" ]; then - # - # fd3 == stdout to logfile - # fd4 == stderr to logfile - # + # + # fd3 == stdout to logfile + # fd4 == stderr to logfile + # + { { - { + if [ -z "${PTXDIST_QUIET}" ]; then ptxd_make "${@}" 4>&- | # make's stdout on fd0 tee -a "${PTX_LOGFILE}" 2>&4 4>&- check_pipe_status || return - } 2>&1 1>&3 3>&- | - # make's stderr on fd0 - tee -a "${PTX_LOGFILE}" 1>&2 3>&- 4>&- - check_pipe_status || return - } 3>&1 4>&2 - else - exec 3>> "${PTX_LOGFILE}" - ptxd_make "${@}" 2>&1- 1>&3 | tee -a "${PTX_LOGFILE}" 3>&- + else + exec 4>&- + ptxd_make "${@}" 1>> "${PTX_LOGFILE}" + fi + } 2>&1 1>&3 3>&- | + # make's stderr on fd0 + tee -a "${PTX_LOGFILE}" 1>&2 3>&- 4>&- check_pipe_status || return - exec 3>&- - fi + } 3>&1 4>&2 } |