From 87e067ca938dd0ed23e45b55d60c0fd859d037c6 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Thu, 21 Apr 2016 19:48:29 +0200
Subject: Merging upstream version 20160415.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
---
 bin/cnt             |  1 -
 bin/cntsh           |  1 -
 bin/container-shell | 18 +++++++++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)
 delete mode 120000 bin/cnt
 delete mode 120000 bin/cntsh

(limited to 'bin')

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
-- 
cgit v1.2.3