github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into blaze-refactor

Browse Source 
Conflicts:
	packages/webapp/webapp_server.js
This commit is contained in:
David Greenspan
2014-07-01 13:29:04 -07:00
parent e31127251b 6bf6480569
commit dfbbde4aa7
19 changed files with 399 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/admin/copy-dev-bundle-from-jenkins.sh
View File

@@ -37,5 +37,12 @@ echo Found build $DIRNAME
s3cmd ls s3://com.meteor.jenkins/$DIRNAME/ | \
perl -nle 'if (/\.tar\.gz/) { ++$TAR } else { die "something weird" } END { exit !($TAR == 3) }'
for FILE in $(s3cmd ls s3://com.meteor.jenkins/$DIRNAME/ | perl -nlaF/ -e 'print $F[-1]'); do
if s3cmd info $TARGET$FILE >/dev/null 2>&1; then
echo "$TARGET$FILE already exists (maybe from another branch?)"
exit 1
fi
done
echo Copying to $TARGET
s3cmd -P cp -r s3://com.meteor.jenkins/$DIRNAME/ $TARGET

2
scripts/admin/install-engine.sh
View File

@@ -79,7 +79,7 @@ INSTALL_TMPDIR="$HOME/.meteor-install-tmp"
rm -rf "$INSTALL_TMPDIR"
mkdir "$INSTALL_TMPDIR"
echo "Downloading Meteor distribution"
curl --progress-bar --fail "$TARBALL_URL" | tar -xzf - -C "$INSTALL_TMPDIR"
curl --progress-bar --fail "$TARBALL_URL" | tar -xzf - -C "$INSTALL_TMPDIR" -o
# bomb out if it didn't work, eg no net
test -x "${INSTALL_TMPDIR}/.meteor/meteor"
mv "${INSTALL_TMPDIR}/.meteor" "$HOME"