catalyst-auto: squelch all pushd/popd

Have some sed magic, including a negative match.

git grep -l -e pushd -e popd \
| xargs sed -i -r \
  -e '/(pushd|popd)/{ /null/! { s,$, >/dev/null,g } }'

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

18 files changed, 56 insertions, 56 deletions

diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index ae5ec8bb..e98fba0d 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -29,13 +29,13 @@ pre_build() {
 
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-    pushd $d
+    pushd $d >/dev/null
     for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
       of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
       of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
       ln -sf $f $of
     done
-    popd
+    popd >/dev/null
   done
 }
 
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index 93176507..4dc879a6 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -51,24 +51,24 @@ give_latest_from_dates() {
 }
 
 pre_build() {
-	pushd ${REPO_DIR}
+	pushd ${REPO_DIR} >/dev/null
 	git pull
-	popd
+	popd >/dev/null
 
 	# Symlink the latest stages3 to build from
 	for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
-		pushd $d
+		pushd $d >/dev/null
 		for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
 			of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
 			of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
 			ln -sf $f $of
 		done
-		popd
+		popd >/dev/null
 	done
 }
 
 post_build() {
-	pushd ${BUILD_SRCDIR_BASE}/default
+	pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
 
 	mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
 	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
@@ -79,9 +79,9 @@ post_build() {
 	if [ -f *${DATESTAMP}*.iso ]; then
 		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP}
 	fi
-	popd
+	popd >/dev/null
 
-	pushd ${BUILD_SRCDIR_BASE}/hardened
+	pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
 
 	mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
 	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 80bf8b78..ea0a6cea 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -62,25 +62,25 @@ give_latest_from_dates() {
 update_symlinks() {
 	# Symlink the latest stages3 to build from
 	for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
-		pushd $d
+		pushd $d >/dev/null
 		for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
 			of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
 			of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
 			ln -sf $f $of
 		done
-		popd
+		popd >/dev/null
 	done
 }
 
 pre_build() {
-	pushd ${REPO_DIR}
+	pushd ${REPO_DIR} >/dev/null
 	git pull
-	popd
+	popd >/dev/null
 	update_symlinks
 }
 
 post_build() {
-	pushd ${BUILD_SRCDIR_BASE}/default
+	pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
 	mkdir -p ${BUILD_DESTDIR_BASE}
 	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
 		if [ -f $file ]; then
@@ -90,9 +90,9 @@ post_build() {
 	if [ -f *${DATESTAMP}*.iso ]; then
 		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
 	fi
-	popd
+	popd >/dev/null
 
-	pushd ${BUILD_SRCDIR_BASE}/hardened
+	pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
 	mkdir -p ${BUILD_DESTDIR_BASE}/hardened
 	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
 		if [ -f $file ]; then
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
index d37bf1c4..75fda247 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -32,13 +32,13 @@ pre_build() {
 
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-    pushd $d
+    pushd $d >/dev/null
     for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
       of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
       of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
       ln -sf $f $of
     done
-    popd
+    popd >/dev/null
   done
 }
 
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
index 0945ad5e..2a02f117 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -32,13 +32,13 @@ pre_build() {
 
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-    pushd $d
+    pushd $d >/dev/null
     for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
       of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
       of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
       ln -sf $f $of
     done
-    popd
+    popd >/dev/null
   done
 }
 
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index ad4c8f54..bf5c3aa0 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -32,13 +32,13 @@ pre_build() {
 
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-    pushd $d
+    pushd $d >/dev/null
     for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
       of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
       of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
       ln -sf $f $of
     done
-    popd
+    popd >/dev/null
   done
 }
 
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
index 845cafa6..771f4454 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -32,13 +32,13 @@ pre_build() {
 
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-    pushd $d
+    pushd $d >/dev/null
     for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
       of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
       of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
       ln -sf $f $of
     done
-    popd
+    popd >/dev/null
   done
 }
 
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index b3ca0188..363188b3 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -32,13 +32,13 @@ pre_build() {
 
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-    pushd $d
+    pushd $d >/dev/null
     for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
       of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
       of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
       ln -sf $f $of
     done
-    popd
+    popd >/dev/null
   done
 }
 
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
index c30b1327..e85ca6c0 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -32,13 +32,13 @@ pre_build() {
 
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-    pushd $d
+    pushd $d >/dev/null
     for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
       of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
       of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
       ln -sf $f $of
     done
-    popd
+    popd >/dev/null
   done
 }
 
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 4eb05659..aa5fdde2 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -34,7 +34,7 @@ pre_build() {
 
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-    pushd $d
+    pushd $d >/dev/null
     for t in hppa1.1 hppa2.0; do
       for f in $(ls stage3-${t}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
         of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
@@ -42,7 +42,7 @@ pre_build() {
         ln -sf $f $of
       done
     done
-    popd
+    popd >/dev/null
   done
 }
 
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index ad7dbd49..fc53d33e 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -29,13 +29,13 @@ pre_build() {
 
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-    pushd $d
+    pushd $d >/dev/null
     for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
       of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
       of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
       ln -sf $f $of
     done
-    popd
+    popd >/dev/null
   done
 }
 
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index f5a7e9a2..6b7445c8 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -30,13 +30,13 @@ pre_build() {
 
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-    pushd $d
+    pushd $d >/dev/null
       for f in $(ls stage3-ppc-*bz2 | grep -v latest | give_latest_from_dates ) ; do
         of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
         of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
         ln -sf $f $of
       done
-    popd
+    popd >/dev/null
   done
 }
  
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index d5ef9264..85571cc6 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -32,7 +32,7 @@ pre_build() {
 
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-    pushd $d
+    pushd $d >/dev/null
     for t in ppc64-64ul ppc64-32ul; do
       for f in $(ls stage3-${t}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
         of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
@@ -40,7 +40,7 @@ pre_build() {
         ln -sf $f $of
       done
     done
-    popd
+    popd >/dev/null
   done
 }
  
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 19a8bac7..1f766eeb 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -29,13 +29,13 @@ pre_build() {
 
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-    pushd $d
+    pushd $d >/dev/null
     for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
       of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
       of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
       ln -sf $f $of
     done
-    popd
+    popd >/dev/null
   done
 }
 
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 01abfe35..a97a3f79 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -29,13 +29,13 @@ pre_build() {
 
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-    pushd $d
+    pushd $d >/dev/null
     for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
       of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
       of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
       ln -sf $f $of
     done
-    popd
+    popd >/dev/null
   done
 }
 
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 59a75c37..c866c081 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -29,13 +29,13 @@ pre_build() {
 
   # Symlink the latest stages3 to build from
   for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do
-    pushd $d
+    pushd $d >/dev/null
     for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
       of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
       of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
       ln -sf $f $of
     done
-    popd
+    popd >/dev/null
   done
 }
 
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index f8beb817..79f310dd 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -38,24 +38,24 @@ give_latest_from_dates() {
 }
 
 pre_build() {
-	pushd ${REPO_DIR}
+	pushd ${REPO_DIR} >/dev/null
 	git pull
-	popd
+	popd >/dev/null
 
 	# Symlink the latest stages3 to build from
 	for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
-		pushd $d
+		pushd $d >/dev/null
 		for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
 			of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
 			of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
 			ln -sf $f $of
 		done
-		popd
+		popd >/dev/null
 	done
 }
 
 post_build() {
-	pushd ${BUILD_SRCDIR_BASE}/default
+	pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
 
 	mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
 	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
@@ -67,9 +67,9 @@ post_build() {
 	if [ -f *${DATESTAMP}*.iso ]; then
 		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
 	fi
-	popd
+	popd >/dev/null
 
-	pushd ${BUILD_SRCDIR_BASE}/hardened
+	pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
 
 	mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
 	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index d613264f..4d49b8b4 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -38,24 +38,24 @@ give_latest_from_dates() {
 }
 
 pre_build() {
-	pushd ${REPO_DIR}
+	pushd ${REPO_DIR} >/dev/null
 	git pull
-	popd
+	popd >/dev/null
 
 	# Symlink the latest stages3 to build from
 	for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
-		pushd $d
+		pushd $d >/dev/null
 		for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
 			of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
 			of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
 			ln -sf $f $of
 		done
-		popd
+		popd >/dev/null
 	done
 }
 
 post_build() {
-	pushd ${BUILD_SRCDIR_BASE}/default
+	pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
 	mkdir -p ${BUILD_DESTDIR_BASE}
 	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
 		if [ -f $file ]; then
@@ -65,9 +65,9 @@ post_build() {
 	if [ -f *${DATESTAMP}*.iso ]; then
 		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
 	fi
-	popd
+	popd >/dev/null
 
-	pushd ${BUILD_SRCDIR_BASE}/hardened
+	pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
 	mkdir -p ${BUILD_DESTDIR_BASE}/hardened
 	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
 		if [ -f $file ]; then