namespace-browser: update helper scripts.
Change-Id: I2a4c182a9d5a9f88644190bb4b052ec35fda7fde
diff --git a/scripts/services/common.sh b/scripts/services/common.sh
index cf4ade3..805b2b8 100755
--- a/scripts/services/common.sh
+++ b/scripts/services/common.sh
@@ -9,7 +9,7 @@
# TODO(aghassemi) This script is becoming too complicated and
# big for shell scripting, switch to a JavaScript or Go implementation
-source "$(veyron go list -f {{.Dir}} v.io/core/shell/lib)/shell.sh"
+source "$(v23 go list -f {{.Dir}} v.io/core/shell/lib)/shell.sh"
trap 'terminate force' INT TERM
trap 'terminate' EXIT
@@ -56,17 +56,17 @@
# build is used to install binaries needed to run services.
build() {
- export GOPATH="${VANADIUM_ROOT}/veyron-browser/go"
- export VDLPATH="${VANADIUM_ROOT}/veyron-browser/go"
- export GOBIN="${VANADIUM_ROOT}/veyron-browser/go/bin"
+ export GOPATH="${VANADIUM_ROOT}/release/projects/namespace_browser/go"
+ export VDLPATH="${VANADIUM_ROOT}/release/projects/namespace_browser/go"
+ export GOBIN="${VANADIUM_ROOT}/release/projects/namespace_browser/go/bin"
- veyron go install v.io/core/veyron/services/mounttable/mounttabled
- veyron go install v.io/core/veyron/services/proxy/proxyd
- veyron go install v.io/core/veyron/services/mgmt/binary/binaryd
- veyron go install v.io/core/veyron/services/mgmt/build/buildd
- veyron go install v.io/core/veyron/tools/principal
- veyron go install v.io/wspr/veyron/services/wsprd
- veyron go install sample/sampled
+ v23 go install v.io/core/veyron/services/mounttable/mounttabled
+ v23 go install v.io/core/veyron/services/proxy/proxyd
+ v23 go install v.io/core/veyron/services/mgmt/binary/binaryd
+ v23 go install v.io/core/veyron/services/mgmt/build/buildd
+ v23 go install v.io/core/veyron/tools/principal
+ v23 go install v.io/wspr/veyron/services/wsprd
+ v23 go install sample/sampled
}
# common::fail will output a red FAILED message along with and optional message given
diff --git a/scripts/services/run-webapp.sh b/scripts/services/run-webapp.sh
index 34b691f..251cccf 100755
--- a/scripts/services/run-webapp.sh
+++ b/scripts/services/run-webapp.sh
@@ -3,7 +3,7 @@
# This script runs mounttables, proxy daemons, a http server and
# a few sample servers to run and demo the Veyron Browser.
-source "${VANADIUM_ROOT}/veyron-browser/scripts/services/common.sh"
+source "${VANADIUM_ROOT}/release/projects/namespace_browser/scripts/services/common.sh"
main() {
local -r MOUNTTABLE_PORT=5167
@@ -17,8 +17,8 @@
common::run "${MOUNTTABLE_PORT}" "${MOUNTTABLE_PORT_HOUSE}" "${MOUNTTABLE_PORT_COTTAGE}" "${WSPR_PORT}" "${PROXY_PORT}" "${VEYRON_IDENTITY_DIR}" "${SEEK_BLESSSING}"
- local -r SERVE="${VANADIUM_ROOT}/veyron-browser/node_modules/.bin/serve"
- "${SERVE}" "${VANADIUM_ROOT}"/veyron-browser/public/. --port "${HTTP_PORT}" --compress &
+ local -r SERVE="${VANADIUM_ROOT}/release/projects/namespace_browser/node_modules/.bin/serve"
+ "${SERVE}" "${VANADIUM_ROOT}"/release/projects/namespace_browser/public/. --port "${HTTP_PORT}" --compress &
}
main "$@"
