TBR: Mv lib/shell from core to playground which is now the only code that uses it.
Change-Id: I824ffe1f933b82f9e8f318f390e7e99b3bef6ca2
diff --git a/go/src/playground/lib/pg_test_util.sh b/client/lib/shell/pg_test_util.sh
similarity index 96%
rename from go/src/playground/lib/pg_test_util.sh
rename to client/lib/shell/pg_test_util.sh
index 629aa14..ac4a84b 100755
--- a/go/src/playground/lib/pg_test_util.sh
+++ b/client/lib/shell/pg_test_util.sh
@@ -8,7 +8,7 @@
# Assumes the playground package is included in GOPATH.
PLAYGROUND_ROOT="$(CDPATH="" cd -P $(go list -f {{.Dir}} playground)/../../.. && pwd)"
-source "$(go list -f {{.Dir}} v.io/core/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} playground)/../../../client/lib/shell/shell_test.sh"
# Sets up environment variables required for the tests.
setup_environment() {
diff --git a/lib/pkg.go b/client/lib/shell/pkg.go
similarity index 100%
rename from lib/pkg.go
rename to client/lib/shell/pkg.go
diff --git a/lib/shell.sh b/client/lib/shell/shell.sh
similarity index 100%
rename from lib/shell.sh
rename to client/lib/shell/shell.sh
diff --git a/lib/shell_test.sh b/client/lib/shell/shell_test.sh
similarity index 98%
rename from lib/shell_test.sh
rename to client/lib/shell/shell_test.sh
index c53a6ac..9bfa37b 100755
--- a/lib/shell_test.sh
+++ b/client/lib/shell/shell_test.sh
@@ -6,7 +6,7 @@
# handler must call shell_test::at_exit to clean up all temporary
# files and directories created by this library.
-source "$(go list -f {{.Dir}} v.io/core/shell/lib)/shell.sh"
+source "$(go list -f {{.Dir}} playground)/../../../client/lib/shell/shell.sh"
trap shell_test::at_exit INT TERM EXIT
diff --git a/lib/test.sh b/client/lib/shell/test.sh
similarity index 97%
rename from lib/test.sh
rename to client/lib/shell/test.sh
index 4c4ab23..620f9d0 100755
--- a/lib/test.sh
+++ b/client/lib/shell/test.sh
@@ -4,7 +4,7 @@
# Unit tests for the shell functions in this directory
#
-source "$(go list -f {{.Dir}} v.io/core/shell/lib)/shell_test.sh"
+source "$(go list -f {{.Dir}} playground)/../../../client/lib/shell/shell_test.sh"
test_assert() {
shell_test::assert_eq "foo" "foo" "${LINENO}"
diff --git a/client/test.sh b/client/test.sh
index 21968c7..b0d2924 100755
--- a/client/test.sh
+++ b/client/test.sh
@@ -9,7 +9,7 @@
# v.io/core/shell/lib/shell_test.sh sourced via playground/lib/pg_test_util.sh
# (shell_test.sh has side effects, should not be sourced again)
-source "$(go list -f {{.Dir}} playground)/lib/pg_test_util.sh"
+source "$(go list -f {{.Dir}} playground)/../../../client/lib/shell/pg_test_util.sh"
main() {
cd "${shell_test_WORK_DIR}"
diff --git a/go/src/playground/test.sh b/go/src/playground/test.sh
index 1e9f197..12c7d88 100755
--- a/go/src/playground/test.sh
+++ b/go/src/playground/test.sh
@@ -4,7 +4,7 @@
# v.io/core/shell/lib/shell_test.sh sourced via playground/lib/pg_test_util.sh
# (shell_test.sh has side effects, should not be sourced again)
-source "$(go list -f {{.Dir}} playground)/lib/pg_test_util.sh"
+source "$(go list -f {{.Dir}} playground)/../../../client/lib/shell/pg_test_util.sh"
# Sets up a directory with the given files, then runs builder.
test_with_files() {
