prevent pushd/popd from polluting output

This commit is contained in:
gorhill 2016-04-03 18:06:19 -04:00
parent a9d36027e1
commit 909ef5303d
3 changed files with 7 additions and 6 deletions

View File

@ -7,9 +7,9 @@ DES=$1/assets
printf "*** Packaging assets in $DES... " printf "*** Packaging assets in $DES... "
if [ -n "${TRAVIS_TAG}" ]; then if [ -n "${TRAVIS_TAG}" ]; then
pushd .. pushd .. > /dev/null
git clone https://github.com/uBlockOrigin/uAssets.git git clone https://github.com/uBlockOrigin/uAssets.git
popd popd > /dev/null
fi fi
rm -rf $DES rm -rf $DES

View File

@ -26,9 +26,9 @@ cp LICENSE.txt $DES/
if [ "$1" = all ]; then if [ "$1" = all ]; then
echo "*** uBlock0.chromium: Creating package..." echo "*** uBlock0.chromium: Creating package..."
pushd $(dirname $DES/) pushd $(dirname $DES/) > /dev/null
zip uBlock0.chromium.zip -qr $(basename $DES/)/* zip uBlock0.chromium.zip -qr $(basename $DES/)/*
popd popd > /dev/null
fi fi
echo "*** uBlock0.chromium: Package done." echo "*** uBlock0.chromium: Package done."

View File

@ -35,10 +35,11 @@ echo "*** uBlock0.firefox: Generating meta..."
python tools/make-firefox-meta.py $DES/ "$2" python tools/make-firefox-meta.py $DES/ "$2"
if [ "$1" = all ]; then if [ "$1" = all ]; then
set +v
echo "*** uBlock0.firefox: Creating package..." echo "*** uBlock0.firefox: Creating package..."
pushd $DES/ pushd $DES/ > /dev/null
zip ../uBlock0.firefox.xpi -qr * zip ../uBlock0.firefox.xpi -qr *
popd popd > /dev/null
fi fi
echo "*** uBlock0.firefox: Package done." echo "*** uBlock0.firefox: Package done."