commit e65bf748f580334bbb89f3b16777ae65c32e25b0
author Ross Wang <rosswang@google.com> Wed Aug 12 10:39:04 2015 -0700
committer Ross Wang <rosswang@google.com> Fri Aug 14 12:40:36 2015 -0700
tree 840711284455a5af712368b5e055ecc9238ebe3e
parent ff2a118add9f7d75cf1be11d8c45fcbaebf5e249

Fixing merge defects

Change-Id: I6b663bd1f3dd061d8bce4fba2866b5e398571423

tools/start_services.sh

diff --git a/tools/start_services.sh b/tools/start_services.sh
index 678b9aa..b8e74a5 100644
--- a/tools/start_services.sh
+++ b/tools/start_services.sh
@@ -25,14 +25,15 @@
   fi
 }
 main() {
+  PATH=${PATH}:${V23_ROOT}/release/go/bin
   local -r TMP=tmp
-  local -r CREDS=tmp/creds/${creds-}
+  local -r CREDS=./tmp/creds/${creds-}
   local -r PORT=${port-4000}
   local -r MOUNTTABLED_ADDR=":$((PORT+1))"
   local -r SYNCBASED_ADDR=":$((PORT))"
-  local -r BLESSINGS=`./bin/principal dump --v23.credentials=${CREDS} -s=true`
+  local -r BLESSINGS=`principal dump --v23.credentials=${CREDS} -s=true`
   mkdir -p $TMP
-  ${V23_ROOT}/release/go/bin/mounttabled \
+  mounttabled \
     --v23.tcp.address=${MOUNTTABLED_ADDR} \
     --v23.credentials=${CREDS} &
   ./bin/syncbased \