summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2016-04-21 17:48:13 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2016-05-06 12:05:31 +0000
commitba34645a988c4c5daf702050ab9bb2e9b630b44d (patch)
treee0d5c6db7579b56308f4d092952e403becd984a5 /bin
parentAdding upstream version 20160401. (diff)
downloadopen-infrastructure-compute-tools-ba34645a988c4c5daf702050ab9bb2e9b630b44d.tar.xz
open-infrastructure-compute-tools-ba34645a988c4c5daf702050ab9bb2e9b630b44d.zip
Adding upstream version 20160415.upstream/20160415
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to '')
l---------bin/cnt1
l---------bin/cntsh1
-rwxr-xr-xbin/container-shell18
3 files changed, 13 insertions, 7 deletions
diff --git a/bin/cnt b/bin/cnt
deleted file mode 120000
index 50208cb..0000000
--- a/bin/cnt
+++ /dev/null
@@ -1 +0,0 @@
-container \ No newline at end of file
diff --git a/bin/cntsh b/bin/cntsh
deleted file mode 120000
index 38c4486..0000000
--- a/bin/cntsh
+++ /dev/null
@@ -1 +0,0 @@
-container-shell \ No newline at end of file
diff --git a/bin/container-shell b/bin/container-shell
index f40d711..4639537 100755
--- a/bin/container-shell
+++ b/bin/container-shell
@@ -43,7 +43,13 @@ Shell ()
OPTIONS="${@}"
case "${COMMAND}" in
- exit|logout|quit)
+ about)
+ man ${PROGRAM} || true
+
+ return
+ ;;
+
+ logout)
exit 0
;;
@@ -52,16 +58,17 @@ Shell ()
"")
echo
echo "The following ${PROGRAM} commands are available:"
+ echo
cd "/usr/lib/${SOFTWARE}/${PROGRAM}"
- ls
+ echo "$(for COMMAND in about logout *; do echo ${COMMAND}; done | sort)"
cd "${OLDPWD}"
return
;;
*)
- man container-${1}
+ man ${PROGRAM}-${1} || true
return
;;
@@ -74,14 +81,15 @@ Shell ()
echo "'${COMMAND}': no such ${PROGRAM} command" >&2
return
else
+ echo
"/usr/lib/${SOFTWARE}/${PROGRAM}/${COMMAND}" "${OPTIONS}" || true
fi
}
trap 'echo' EXIT HUP INT QUIT TERM
-echo "${PROGRAM}-shell $(${PROGRAM} version)"
-echo "Type \"help\" for more information."
+echo "${SOFTWARE} $(${PROGRAM} version)"
+echo "Type \"about\" or \"help\" for more information, \"logout\" to exit."
while true
do