From e027330751dd78225bd01ad11013d1a0c14f4467 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Thu, 22 Jul 2010 23:07:55 +0200
Subject: [ptxd_make_log] unify quiet and non quiet mode

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 scripts/libptxdist.sh | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'scripts/libptxdist.sh')

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
 }
 
 
-- 
cgit v1.2.3