diff options
author | gorhill <rhill@raymondhill.net> | 2016-04-03 18:06:19 -0400 |
---|---|---|
committer | gorhill <rhill@raymondhill.net> | 2016-04-03 18:06:19 -0400 |
commit | 909ef5303dbf7b24fd658673b41520aa17b45481 (patch) | |
tree | 2086ce372eeaae33ec49aa65e12f78d147c8896b /tools | |
parent | a9d36027e1572661de9257c9653663358e760f73 (diff) |
prevent pushd/popd from polluting output
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/make-assets.sh | 4 | ||||
-rwxr-xr-x | tools/make-chromium.sh | 4 | ||||
-rwxr-xr-x | tools/make-firefox.sh | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/tools/make-assets.sh b/tools/make-assets.sh index 62ddd8a3..fade452d 100755 --- a/tools/make-assets.sh +++ b/tools/make-assets.sh @@ -7,9 +7,9 @@ DES=$1/assets printf "*** Packaging assets in $DES... " if [ -n "${TRAVIS_TAG}" ]; then - pushd .. + pushd .. > /dev/null git clone https://github.com/uBlockOrigin/uAssets.git - popd + popd > /dev/null fi rm -rf $DES diff --git a/tools/make-chromium.sh b/tools/make-chromium.sh index 57b61d1f..ead1168f 100755 --- a/tools/make-chromium.sh +++ b/tools/make-chromium.sh @@ -26,9 +26,9 @@ cp LICENSE.txt $DES/ if [ "$1" = all ]; then echo "*** uBlock0.chromium: Creating package..." - pushd $(dirname $DES/) + pushd $(dirname $DES/) > /dev/null zip uBlock0.chromium.zip -qr $(basename $DES/)/* - popd + popd > /dev/null fi echo "*** uBlock0.chromium: Package done." diff --git a/tools/make-firefox.sh b/tools/make-firefox.sh index e1b4626c..464af81a 100755 --- a/tools/make-firefox.sh +++ b/tools/make-firefox.sh @@ -35,10 +35,11 @@ echo "*** uBlock0.firefox: Generating meta..." python tools/make-firefox-meta.py $DES/ "$2" if [ "$1" = all ]; then + set +v echo "*** uBlock0.firefox: Creating package..." - pushd $DES/ + pushd $DES/ > /dev/null zip ../uBlock0.firefox.xpi -qr * - popd + popd > /dev/null fi echo "*** uBlock0.firefox: Package done." |