commit c20edb49175ee54baf1b8842098699c04285aac4
author Nicolas Lacasse <nlacasse@google.com> Tue Feb 23 21:52:05 2016 +0000
committer Nicolas Lacasse <nlacasse@google.com> Tue Feb 23 21:52:05 2016 +0000
tree 05b05490887302bdf98677f5c7b77ebfa40149b9
parent aa3bc3fb7e138522408d32bb482f0ca284cde51d

TBR: Revert "TBR: Revert "jiri: The jiri script must put $JIRI_ROOT/.jiri_root/bin in PATH before invoking the jiri binary.""

This reverts commit aa3bc3fb7e138522408d32bb482f0ca284cde51d.

Change-Id: I0e8f3222cd57d07cbafb0ac11c82535af687205f

cmd/jiri/scripts/jiri

diff --git a/cmd/jiri/scripts/jiri b/cmd/jiri/scripts/jiri
index 6684669..9834583 100755
--- a/cmd/jiri/scripts/jiri
+++ b/cmd/jiri/scripts/jiri
@@ -57,5 +57,9 @@
   fatal "${JIRI_ROOT}/.jiri_root/bin/jiri is not executable"
 fi
 
+# Add $JIRI_ROOT/.jiri_root/bin to PATH, so that the jiri binary can find the
+# subcommand binaries.
+export PATH="${JIRI_ROOT}/.jiri_root/bin:${PATH}"
+
 # Execute the jiri binary.
 exec "${JIRI_ROOT}/.jiri_root/bin/jiri" "$@"

scripts/jiri

diff --git a/scripts/jiri b/scripts/jiri
index 6684669..9834583 100755
--- a/scripts/jiri
+++ b/scripts/jiri
@@ -57,5 +57,9 @@
   fatal "${JIRI_ROOT}/.jiri_root/bin/jiri is not executable"
 fi
 
+# Add $JIRI_ROOT/.jiri_root/bin to PATH, so that the jiri binary can find the
+# subcommand binaries.
+export PATH="${JIRI_ROOT}/.jiri_root/bin:${PATH}"
+
 # Execute the jiri binary.
 exec "${JIRI_ROOT}/.jiri_root/bin/jiri" "$@"