Merge "jiri: Remove Hosts and make gerrithost and githooks attributes on Project."
diff --git a/scripts/bootstrap_jiri b/scripts/bootstrap_jiri
index d02e2e6..d43074c 100755
--- a/scripts/bootstrap_jiri
+++ b/scripts/bootstrap_jiri
@@ -26,7 +26,7 @@
A typical bootstrap workflow looks like this:
$ curl -s https://raw.githubusercontent.com/vanadium/go.jiri/master/scripts/bootstrap_jiri | bash -s myroot
-$ export PATH=myroot/scripts:$PATH
+$ export PATH=myroot/.jiri_root/scripts:$PATH
$ cd myroot
$ jiri import public https://vanadium.googlesource.com/manifest
$ jiri update'
diff --git a/scripts/jiri b/scripts/jiri
index 24593ed..7b3ce59 100755
--- a/scripts/jiri
+++ b/scripts/jiri
@@ -38,7 +38,7 @@
# If $JIRI_ROOT is set we always use it, otherwise look for a .jiri_root
# directory starting with the current working directory, and walking up.
-if [[ "${JIRI_ROOT}" == "" ]]; then
+if [[ -z ${JIRI_ROOT+x} ]]; then
while [[ ! -d "$(pwd)/.jiri_root" ]]; do
if [[ "$(pwd)" == "/" ]]; then
fatal "could not find .jiri_root directory"
