Skip to content

Commit 0eff960

Browse files
committed
use meteor --get-ready instead of --version in places where we're trying to make
sure a checkout is complete
1 parent 111582d commit 0eff960

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

packages/test-in-console/run.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ cd ../..
55
export METEOR_HOME=`pwd`
66

77
export PATH=$METEOR_HOME:$PATH
8-
./meteor --version 2>&1 | grep Unreleased || exit 1 # syncronously get the dev bundle if its not there.
8+
# synchronously get the dev bundle and NPM modules if they're not there.
9+
./meteor --get-ready || exit 1
910

1011
export URL='http://localhost:4096/'
1112

scripts/admin/upgrade-to-engine/build-fake-release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ trap 'rm -rf "$FAKE_TMPDIR" >/dev/null 2>&1' 0
2424
echo "Building a fake release in $FAKE_TMPDIR."
2525

2626
# Make sure dev bundle exists.
27-
./meteor --version 2>&1 | grep Unreleased
27+
./meteor --get-ready
2828

2929
# Start out with just the dev bundle.
3030
cp -a dev_bundle "$FAKE_TMPDIR/meteor"

scripts/node.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ TOPDIR=$(pwd)
77

88
# download dev bundle if we don't have it already
99
if [ ! -d dev_bundle ] ; then
10-
./meteor --version
10+
./meteor --get-ready
1111
fi
1212

1313
cd "$ORIGDIR"

scripts/run-tools-tests.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cd `dirname $0`
55
METEOR_DIR=`pwd`/..
66
# Die with message on failure, print commands being executed
77
trap 'echo FAILED' EXIT
8-
set -e -x
8+
set -e -u -x
99

1010
# linux mktemp requires at least 3 X's in the last component.
1111
make_temp_dir() {

0 commit comments

Comments
 (0)