Redirect ugly pushd and popd dir stack prints to /dev/null.

Adminotech · Jun 17, 2012 · 0b4a431 · 0b4a431
1 parent 9fe1f72
commit 0b4a431
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 16 deletions.
diff --git a/build-all.sh b/build-all.sh
@@ -170,8 +170,7 @@ echo "-- Install prefix  = ${PREFIX}"
 echo "-- CMake toolchain = $PREFAB/android.toolchain.cmake"
 echo
 
-pushd $SRCDIR
-echo
+pushd $SRCDIR >> /dev/null
 
 if [ "${INPUT_SKIP_DEPS}" == "FALSE" ] ; then
     ${TOPDIR}/build-bzip2.sh
@@ -190,8 +189,7 @@ else
     echo -e "${COLOR_BLUE}Skipping Tundra build by request${COLOR_END}"
 fi
 
-popd
-echo
+popd >> /dev/null
 
 if [ "${INPUT_SKIP_ANDROID}" == "FALSE" ] ; then
     ${TOPDIR}/build-tundra-android.sh

diff --git a/build-boost.sh b/build-boost.sh
@@ -44,7 +44,7 @@ else
     echo "-- ${BOOST_SOURCE_NAME}.tar.gz already downloaded and extracted, skipping."
 fi
 
-pushd "${BOOST_SOURCE_NAME}"
+pushd "${BOOST_SOURCE_NAME}" >> /dev/null
 
 # Make the initial bootstrap
 if [ ! -f ./b2 ] ; then
@@ -160,6 +160,6 @@ else
     echo "-- Already built, remove ${DETECTION_LIB} to trigger a rebuild."
 fi
 
-popd
+popd >> /dev/null
 echo
 
diff --git a/build-bullet.sh b/build-bullet.sh
@@ -21,7 +21,7 @@ if [ ! -f ${DETECTION_LIB} ] ; then
     make -j4
     make install
 
-    popd
+    popd >> /dev/null
 else
     echo "-- Already built, remove ${DETECTION_LIB} to trigger a rebuild."
 fi

diff --git a/build-bzip2.sh b/build-bzip2.sh
@@ -64,7 +64,7 @@ if [ ! -f ${DETECTION_LIB} ] ; then
     make CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" CFLAGS="${CFLAGS}"
     make install PREFIX=${PREFIX}  # Ignore errors due to share libraries missing
 
-    popd
+    popd >> /dev/null
 else
     echo "-- Already built, remove ${DETECTION_LIB} to trigger a rebuild."
 fi

diff --git a/build-knet.sh b/build-knet.sh
@@ -28,7 +28,7 @@ if [ ! -f ${DETECTION_LIB} ] ; then
     cp -u lib/libkNet.a ${PREFIX}/lib/
     cp -u -r include/* ${PREFIX}/include/
 
-    popd
+    popd >> /dev/null
 else
     echo "-- Already built, remove ${DETECTION_LIB} to trigger a rebuild."
 fi

diff --git a/build-ogre.sh b/build-ogre.sh
@@ -41,7 +41,7 @@ if [ ! -f ${DETECTION_LIB} ] ; then
     cp -u ${PREBUILT}/lib/* ${PREFIX}/lib/
     cp -u -r ${PREBUILT}/include/* ${PREFIX}/include/
 
-    popd
+    popd >> /dev/null
 else
     echo "-- Already built, remove ${DETECTION_LIB} to trigger a rebuild."
 fi

diff --git a/build-qt.sh b/build-qt.sh
@@ -29,7 +29,7 @@ else
     echo "-- Repository already cloned, skipping."
 fi
 
-pushd "${QT_SOURCE_DIR}"
+pushd "${QT_SOURCE_DIR}" >> /dev/null
 
 QT_CONF_ARG="0"
 if [ ! -f android/tundra.qt.configured ] ; then
@@ -58,6 +58,6 @@ else
     echo "   cd src/qt && git clean -fdx && git checkout ./ && rm ${DETECTION_LIB}"
 fi
 
-popd
+popd >> /dev/null
 echo
 
diff --git a/build-tundra-android.sh b/build-tundra-android.sh
@@ -3,7 +3,7 @@ echo -e "${COLOR_GREEN}Building and packaging tundra for android${COLOR_END}"
 
 TUNDRA_ANDROID_SOURCE_DIR=build-android
 
-pushd "${TUNDRA_ANDROID_SOURCE_DIR}"
+pushd "${TUNDRA_ANDROID_SOURCE_DIR}" >> /dev/null
 
 # Set clean path for only NDK/SDK
 PATH_OLD=$PATH
@@ -29,6 +29,6 @@ adb install -r bin/Tundra-debug.apk
 # Restore old path
 export PATH=${PATH_OLD}
 
-popd
+popd >> /dev/null
 echo
 
diff --git a/build-tundra.sh b/build-tundra.sh
@@ -18,7 +18,7 @@ else
     echo -e "${COLOR_BLUE}-- Repository already cloned, skipping.${COLOR_END}"
 fi
 
-pushd "${TUNDRA_SOURCE_DIR}"
+pushd "${TUNDRA_SOURCE_DIR}" >> /dev/null
 
 export TUNDRA_INSTALL_PATH=$(pwd)/android-install
 export TUNDRA_DEP_PATH=${PREFIX}
@@ -67,6 +67,6 @@ else
     echo -e "${COLOR_BLUE}-- 'make install' already done, remove ${TUNDRA_INSTALL_PATH} to reinstall.${COLOR_END}"
 fi
 
-popd
+popd >> /dev/null
 echo