Run jiri's bootstrap_jiri script in bootstrap.sh.
The old instructions about cloning the manifest directly are not going
to be supported much longer.
This CL updates the instructions to use the bootsrap_jiri script.
Change-Id: If2748b0f64eddd34997409658f459c77f326de9f
diff --git a/public/bootstrap.sh b/public/bootstrap.sh
index f3bdc6a..e30c234 100755
--- a/public/bootstrap.sh
+++ b/public/bootstrap.sh
@@ -119,20 +119,16 @@
trap "rm -rf ${JIRI_ROOT}" INT TERM EXIT
- # Create initial directories.
- must run mkdir -p "${JIRI_ROOT}/devtools/bin"
+ # Run the jiri_bootstrap script.
+ curl -f -s https://raw.githubusercontent.com/vanadium/go.jiri/master/scripts/bootstrap_jiri | bash -s $JIRI_ROOT
- # Clone the manifest repository.
- retry run git clone https://vanadium.googlesource.com/manifest "${JIRI_ROOT}/.manifest"
+ # Import the Vanadium public manifest.
+ pushd $JIRI_ROOT
+ $JIRI_ROOT/.jiri_root/bin/jiri import -name=manifest public https://vanadium.googlesource.com/manifest
- # Get and install the jiri tool.
- GOPATH="${JIRI_ROOT}/tmp" retry run go get -d v.io/jiri
- GOPATH="${JIRI_ROOT}/tmp" must run go build -o "${JIRI_ROOT}/devtools/bin/jiri" v.io/jiri
- rm -rf "${JIRI_ROOT}/tmp"
-
- # Install all Vanadium repositories and tools.
- local -r VANADIUM_MANIFEST="${VANADIUM_MANIFEST:-default}"
- retry "${JIRI_ROOT}/devtools/bin/jiri" update -manifest="${VANADIUM_MANIFEST}"
+ # Sync the Vanadium projects locally.
+ retry $JIRI_ROOT/.jiri_root/bin/jiri update
+ popd
echo "Recommended for contributors:"
echo "Add ${JIRI_ROOT}/devtools/bin to your PATH."
