cmd/mgmt: Move shell files to remove spurious shell/lib package.
Change-Id: I8fe7587ff3b670d82269ba0aad14e3a99e3f347a
diff --git a/cmd/mgmt/shell/lib/shell.sh b/cmd/mgmt/shell.sh
similarity index 100%
rename from cmd/mgmt/shell/lib/shell.sh
rename to cmd/mgmt/shell.sh
diff --git a/cmd/mgmt/shell/lib/pkg.go b/cmd/mgmt/shell/lib/pkg.go
deleted file mode 100644
index 1229481..0000000
--- a/cmd/mgmt/shell/lib/pkg.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2015 The Vanadium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package lib
diff --git a/cmd/mgmt/shell/lib/shell_test.sh b/cmd/mgmt/shell_test.sh
similarity index 98%
rename from cmd/mgmt/shell/lib/shell_test.sh
rename to cmd/mgmt/shell_test.sh
index bf90f2f..c421d63 100755
--- a/cmd/mgmt/shell/lib/shell_test.sh
+++ b/cmd/mgmt/shell_test.sh
@@ -9,7 +9,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/x/ref/cmd/mgmt)/shell/lib/shell.sh"
+source "$(go list -f {{.Dir}} v.io/x/ref/cmd/mgmt)/shell.sh"
trap shell_test::at_exit INT TERM EXIT
diff --git a/cmd/mgmt/suid_test.sh b/cmd/mgmt/suid_test.sh
index 197aa42..fa1912b 100755
--- a/cmd/mgmt/suid_test.sh
+++ b/cmd/mgmt/suid_test.sh
@@ -43,7 +43,7 @@
umask 066
fi
- source "$(go list -f {{.Dir}} v.io/x/ref/cmd/mgmt)/shell/lib/shell_test.sh"
+ source "$(go list -f {{.Dir}} v.io/x/ref/cmd/mgmt)/shell_test.sh"
# Run the test under the security agent.
shell_test::enable_agent "$@"
diff --git a/cmd/mgmt/shell/lib/test.sh b/cmd/mgmt/test.sh
similarity index 97%
rename from cmd/mgmt/shell/lib/test.sh
rename to cmd/mgmt/test.sh
index 8f9c76a..0feaf2a 100755
--- a/cmd/mgmt/shell/lib/test.sh
+++ b/cmd/mgmt/test.sh
@@ -7,7 +7,7 @@
# Unit tests for the shell functions in this directory
#
-source "$(go list -f {{.Dir}} v.io/x/ref/cmd/mgmt)/shell/lib/shell_test.sh"
+source "$(go list -f {{.Dir}} v.io/x/ref/cmd/mgmt)/shell_test.sh"
test_assert() {
shell_test::assert_eq "foo" "foo" "${LINENO}"
