commit b451f55b13d08ca5af45db5536e9f5c3be841973
author Adam Sadovsky <asadovsky@gmail.com> Thu Feb 04 14:57:59 2016 -0800
committer Adam Sadovsky <sadovsky@google.com> Fri Feb 05 00:54:10 2016 +0000
tree 485b6f9b660c8ff451908bb510cb346bb2477313
parent 25a28c3d472b602bba69326f3f2733d47674813e

website: stop failing if 'jiri' exists in PATH

Updates step-by-step.md and setup.md accordingly:
- In step-by-step.md, make sure the 'jiri' tool inside the
  new $JIRI_ROOT takes precedence over any existing 'jiri'
- In setup.md, use the 'jiri' from $JIRI_ROOT instead of
  relying on $PATH

This should fix the test-tutorials-external tests - they
were failing because 'jiri' existed in PATH on Jenkins.

With the changes to step-by-step.md and setup.md, the 'jiri'
check in bootstrap.sh seems unnecessary:

- we already check for $JIRI_ROOT not existing
- we tell contributors to add $JIRI_ROOT/devtools/bin to
  their $PATH
- it should be OK for people to have other copies of 'jiri'
  on their system / in their $PATH, as long as they use the
  right one when working with Vanadium

(An alternative to this CL would be to change the test setup
to temporarily drop 'jiri' from PATH in the test harness,
but that's annoying in its own way...)

Change-Id: Id54cd35e8b1a9b2bfde0212c4f65a391da140f02

content/installation/step-by-step.md

diff --git a/content/installation/step-by-step.md b/content/installation/step-by-step.md
index eea35f1..094e5e4 100644
--- a/content/installation/step-by-step.md
+++ b/content/installation/step-by-step.md
@@ -80,7 +80,7 @@
 Add `$JIRI_ROOT/devtools/bin` to your `PATH`, for `jiri`:
 <!-- @addDevtoolsToPath @test -->
 ```
-export PATH=$PATH:$JIRI_ROOT/devtools/bin
+export PATH=$JIRI_ROOT/devtools/bin:$PATH
 ```
 
 Recommended for contributors: Add the line above to your `~/.bashrc` or similar.

content/tutorials/setup.md

diff --git a/content/tutorials/setup.md b/content/tutorials/setup.md
index 0dfa8d0..c8381e0 100644
--- a/content/tutorials/setup.md
+++ b/content/tutorials/setup.md
@@ -46,7 +46,7 @@
   # Use the contributor's GOPATH rather than the release. See ../testing.md.
   export GOPATH=$V_TUT:${V23_GOPATH}
 else
-  export GOPATH=$V_TUT:`jiri go env GOPATH`
+  export GOPATH=$V_TUT:`${JIRI_ROOT}/devtools/bin/jiri go env GOPATH`
 fi
 
 # HISTCONTROL set as follows excludes long file creation commands used in

public/bootstrap.sh

diff --git a/public/bootstrap.sh b/public/bootstrap.sh
index ad9d475..f3bdc6a 100755
--- a/public/bootstrap.sh
+++ b/public/bootstrap.sh
@@ -65,14 +65,6 @@
     exit 1
   fi
 
-  # Check that the "jiri" command is not already in PATH.
-  local -r JIRI_CMD=$(which jiri)
-  if [[ -n "${JIRI_CMD}" ]]; then
-    echo "Your PATH already contains the 'jiri' command: ${JIRI_CMD}"
-    echo "Remove it from the PATH and re-run."
-    exit 1
-  fi
-
   # Check that the host OS and package manager is supported.
   case $(uname -s) in
     "Linux")