From c7758a578c8f31fadcd58b6e29e77b7dc02a4f7e Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 5 Aug 2017 13:34:20 +0200
Subject: [PATCH] scripts/nightly: another try in redirect

---
 build/common.sh    |  2 +-
 scripts/nightly.sh | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build/common.sh b/build/common.sh
index 2f446d2..6b3b43a 100644
--- a/build/common.sh
+++ b/build/common.sh
@@ -219,7 +219,7 @@ export PRODUCT_RELEASE="${PRODUCT_NAME}-${PRODUCT_VERSION}-${PRODUCT_FLAVOUR}"
 export PRODUCT_PKGNAMES="${PRODUCT_TYPE} ${PRODUCT_TYPE}-devel"
 export PRODUCT_PKGNAME="${PRODUCT_TYPE}${PRODUCT_SUFFIX}"
 
-if [ "${SELF}" != print -a "${SELF}" != info -a "${SELF}" != update ]; then
+if [ "${SELF}" != print -a "${SELF}" != info ]; then
 	if [ -z "${PRINT_ENV_SKIP}" ]; then
 		export PRINT_ENV_SKIP=1
 		env | sort
diff --git a/scripts/nightly.sh b/scripts/nightly.sh
index a0f9013..91ac245 100755
--- a/scripts/nightly.sh
+++ b/scripts/nightly.sh
@@ -2,15 +2,15 @@
 
 # nightly build script
 
-make clean-logs,obj > /dev/null 2>&1
+(make clean-logs,obj 2>&1) > /dev/null
 
-for STAGE in update base kernel distfiles; do
+for STAGE in update info base kernel distfiles; do
 	# we don't normally clean these stages
-	time make ${STAGE} > /tmp/logs/${STAGE}.log 2>&1
+	(time make ${STAGE} 2>&1) > /tmp/logs/${STAGE}.log
 done
 
 for FLAVOUR in OpenSSL LibreSSL; do
-	make clean-packages FLAVOUR=${FLAVOUR} > /dev/null 2>&1
-	time make packages FLAVOUR=${FLAVOUR} \
-	    > /tmp/logs/packages-${FLAVOUR}.log 2>&1
+	(make clean-packages FLAVOUR=${FLAVOUR} 2>&1) > /dev/null
+	(time make packages FLAVOUR=${FLAVOUR} 2>&1) \
+	    > /tmp/logs/packages-${FLAVOUR}.log
 done