From 8e0bbec6f7df3db9aa2b642bb2111cd276a7d71e Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Mon, 12 Jan 2015 17:35:11 -0500 Subject: [PATCH] Simplify gzip/tar dance in generate-dev-bundle.sh. Summary: I recently learned that `curl | tar zx` works just as well as `curl | gzip -d | tar x`. I'm also hoping to test out the new Phabricator. Test Plan: Regenerating the dev bundle on Jenkins. Reviewers: glasser Reviewed By: glasser Differential Revision: https://phabricator.meteor.io/D7 --- scripts/generate-dev-bundle.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/generate-dev-bundle.sh b/scripts/generate-dev-bundle.sh index d2ad0ff957..93693c3928 100755 --- a/scripts/generate-dev-bundle.sh +++ b/scripts/generate-dev-bundle.sh @@ -45,11 +45,11 @@ NODE_BUILD_NUMBER=8 NODE_VERSION=0.10.33 NODE_TGZ="node_${PLATFORM}_v${NODE_VERSION}.tar.gz" if [ -f "${CHECKOUT_DIR}/${NODE_TGZ}" ] ; then - gzip -d <"${CHECKOUT_DIR}/${NODE_TGZ}" | tar x + tar zxf "${CHECKOUT_DIR}/${NODE_TGZ}" else NODE_URL="http://${S3_HOST}/dev-bundle-node-${NODE_BUILD_NUMBER}/${NODE_TGZ}" echo "Downloading Node from ${NODE_URL}" - curl "${NODE_URL}" | gzip -d | tar x + curl "${NODE_URL}" | tar zx fi # Update these values after building the dev-bundle-mongo Jenkins project. @@ -57,11 +57,11 @@ MONGO_BUILD_NUMBER=3 MONGO_VERSION=2.4.12 MONGO_TGZ="mongo_${PLATFORM}_v${MONGO_VERSION}.tar.gz" if [ -f "${CHECKOUT_DIR}/${MONGO_TGZ}" ] ; then - gzip -d <"${CHECKOUT_DIR}/${MONGO_TGZ}" | tar x + tar zxf "${CHECKOUT_DIR}/${MONGO_TGZ}" else MONGO_URL="http://${S3_HOST}/dev-bundle-mongo-${MONGO_BUILD_NUMBER}/${MONGO_TGZ}" echo "Downloading Mongo from ${MONGO_URL}" - curl "${MONGO_URL}" | gzip -d | tar x + curl "${MONGO_URL}" | tar zx fi cd "$DIR/build"