Merge "scripts: reflecting the move of scripts to a separate repository"
diff --git a/runtimes/google/ipc/stream/crypto/test.sh b/runtimes/google/ipc/stream/crypto/test.sh
index 6604950..529d3fa 100755
--- a/runtimes/google/ipc/stream/crypto/test.sh
+++ b/runtimes/google/ipc/stream/crypto/test.sh
@@ -2,7 +2,7 @@
# Ensure that tls_old.go is in sync with tls.go
-source "${VEYRON_ROOT}/environment/scripts/lib/shell_test.sh"
+source "${VEYRON_ROOT}/scripts/lib/shell_test.sh"
main() {
local -r DIR="$(dirname $0)"
diff --git a/runtimes/google/ipc/stream/crypto/tls_generate_old.sh b/runtimes/google/ipc/stream/crypto/tls_generate_old.sh
index 478a390..66a23c5 100755
--- a/runtimes/google/ipc/stream/crypto/tls_generate_old.sh
+++ b/runtimes/google/ipc/stream/crypto/tls_generate_old.sh
@@ -3,7 +3,7 @@
# This script generates a version of tls.go that can be built with Go compilers
# prior to version 1.4.
-source "${VEYRON_ROOT}/environment/scripts/lib/shell.sh"
+source "${VEYRON_ROOT}/scripts/lib/shell.sh"
main() {
local -r DIR="$(dirname "$0")"
diff --git a/security/agent/test.sh b/security/agent/test.sh
index a86f9d1..8d031af 100755
--- a/security/agent/test.sh
+++ b/security/agent/test.sh
@@ -2,7 +2,7 @@
# Test running an application using the agent.
-source "${VEYRON_ROOT}/environment/scripts/lib/shell_test.sh"
+source "${VEYRON_ROOT}/scripts/lib/shell_test.sh"
build() {
local GO="${VEYRON_ROOT}/scripts/build/go"
diff --git a/security/agent/testchild.sh b/security/agent/testchild.sh
index bff6766..addf884 100644
--- a/security/agent/testchild.sh
+++ b/security/agent/testchild.sh
@@ -2,8 +2,7 @@
# Helper script for testing two binaries under the same agent.
-source "${VEYRON_ROOT}/environment/scripts/lib/shell_test.sh"
-
+source "${VEYRON_ROOT}/scripts/lib/shell_test.sh"
main() {
if [[ -n "${VEYRON_IDENTITY}" ]]; then
diff --git a/services/mgmt/application/applicationd/test.sh b/services/mgmt/application/applicationd/test.sh
index 46e2d7b..3ee6e55 100755
--- a/services/mgmt/application/applicationd/test.sh
+++ b/services/mgmt/application/applicationd/test.sh
@@ -6,7 +6,7 @@
# application repository client to verify that <application>.Put(),
# <application>.Match(), and <application>.Remove() work as expected.
-source "${VEYRON_ROOT}/environment/scripts/lib/shell_test.sh"
+source "${VEYRON_ROOT}/scripts/lib/shell_test.sh"
build() {
local -r GO="${VEYRON_ROOT}/scripts/build/go"
diff --git a/services/mgmt/binary/binaryd/test.sh b/services/mgmt/binary/binaryd/test.sh
index d73586b..ce75d4c 100755
--- a/services/mgmt/binary/binaryd/test.sh
+++ b/services/mgmt/binary/binaryd/test.sh
@@ -6,7 +6,7 @@
# repository client to verify that <binary>.Upload(),
# <binary>.Download(), and <binary>.Delete() work as expected.
-source "${VEYRON_ROOT}/environment/scripts/lib/shell_test.sh"
+source "${VEYRON_ROOT}/scripts/lib/shell_test.sh"
build() {
local -r GO="${VEYRON_ROOT}/scripts/build/go"
diff --git a/services/mgmt/build/buildd/test.sh b/services/mgmt/build/buildd/test.sh
index d91e0ff..018cd81 100755
--- a/services/mgmt/build/buildd/test.sh
+++ b/services/mgmt/build/buildd/test.sh
@@ -13,8 +13,9 @@
# TODO(jsimsa,ashankar): Figure out a way to execute all trap handlers instead
# of having to worry about ordering the imports and/or skipping some trap
# handlers.
-source "${VEYRON_ROOT}/environment/scripts/lib/go.sh"
-source "${VEYRON_ROOT}/environment/scripts/lib/shell_test.sh"
+
+source "${VEYRON_ROOT}/scripts/lib/go.sh"
+source "${VEYRON_ROOT}/scripts/lib/shell_test.sh"
build() {
local -r GO="${VEYRON_ROOT}/scripts/build/go"
diff --git a/services/mgmt/profile/profiled/test.sh b/services/mgmt/profile/profiled/test.sh
index e8ce66b..c43a418 100755
--- a/services/mgmt/profile/profiled/test.sh
+++ b/services/mgmt/profile/profiled/test.sh
@@ -7,7 +7,7 @@
# <profile>.Description(), <profile>.Speficiation(), and
# <profile>.Remove() work as expected.
-source "${VEYRON_ROOT}/environment/scripts/lib/shell_test.sh"
+source "${VEYRON_ROOT}/scripts/lib/shell_test.sh"
build() {
local -r GO="${VEYRON_ROOT}/scripts/build/go"
diff --git a/services/mounttable/mounttabled/test.sh b/services/mounttable/mounttabled/test.sh
index 3ad622b..e6983d3 100755
--- a/services/mounttable/mounttabled/test.sh
+++ b/services/mounttable/mounttabled/test.sh
@@ -9,8 +9,7 @@
# Then it verifies that <mounttable>.Glob(*) and <neighborhood>.Glob(nhname)
# return the correct result.
-source "${VEYRON_ROOT}/environment/scripts/lib/shell.sh"
-source "${VEYRON_ROOT}/environment/scripts/lib/shell_test.sh"
+source "${VEYRON_ROOT}/scripts/lib/shell_test.sh"
build() {
local -r GO="${VEYRON_ROOT}/scripts/build/go"
diff --git a/tools/identity/test.sh b/tools/identity/test.sh
index 7f65ca2..b35dc26 100755
--- a/tools/identity/test.sh
+++ b/tools/identity/test.sh
@@ -6,7 +6,7 @@
# Not the "seekblessing" command yet, since that requires
# starting a separate server.
-source "${VEYRON_ROOT}/environment/scripts/lib/shell_test.sh"
+source "${VEYRON_ROOT}/scripts/lib/shell_test.sh"
main() {
# Build binaries.
diff --git a/tools/playground/test.sh b/tools/playground/test.sh
index 0bcb26b..29d36e4 100755
--- a/tools/playground/test.sh
+++ b/tools/playground/test.sh
@@ -2,7 +2,7 @@
# Test the playground builder tool.
-source "${VEYRON_ROOT}/environment/scripts/lib/shell_test.sh"
+source "${VEYRON_ROOT}/scripts/lib/shell_test.sh"
install_veyron_js() {
# This installs the veyron.js library, and makes it accessable to javascript
