commit: e243f99edf0080848382ddeb6dc5fe9035aef871
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 01:29:20 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 01:31:06 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e243f99e
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 <AT> gentoo.org>
tools/catalyst-auto-alpha.conf | 4 ++--
tools/catalyst-auto-amd64-experimental.conf | 14 +++++++-------
tools/catalyst-auto-amd64.conf | 14 +++++++-------
tools/catalyst-auto-armv4tl.conf | 4 ++--
tools/catalyst-auto-armv5tel.conf | 4 ++--
tools/catalyst-auto-armv6j.conf | 4 ++--
tools/catalyst-auto-armv6j_hardfp.conf | 4 ++--
tools/catalyst-auto-armv7a.conf | 4 ++--
tools/catalyst-auto-armv7a_hardfp.conf | 4 ++--
tools/catalyst-auto-hppa.conf | 4 ++--
tools/catalyst-auto-ia64.conf | 4 ++--
tools/catalyst-auto-ppc.conf | 4 ++--
tools/catalyst-auto-ppc64.conf | 4 ++--
tools/catalyst-auto-s390.conf | 4 ++--
tools/catalyst-auto-s390x.conf | 4 ++--
tools/catalyst-auto-sparc64.conf | 4 ++--
tools/catalyst-auto-x86-experimental.conf | 14 +++++++-------
tools/catalyst-auto-x86.conf | 14 +++++++-------
18 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index ae5ec8b..e98fba0 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 9317650..4dc879a 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 80bf8b7..ea0a6ce 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 d37bf1c..75fda24 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 0945ad5..2a02f11 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 ad4c8f5..bf5c3aa 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 845cafa..771f445 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 b3ca018..363188b 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 c30b132..e85ca6c 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 4eb0565..aa5fdde 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 ad7dbd4..fc53d33 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 f5a7e9a..6b7445c 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 d5ef926..85571cc 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 19a8bac..1f766ee 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 01abfe3..a97a3f7 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 59a75c3..c866c08 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 f8beb81..79f310d 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 d613264..4d49b8b 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
