From 8871afb284ce710660aa8c09b6a4a07055bccb89 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Date: Sun, 11 Dec 2016 11:44:49 +0100
Subject: Renaming short format in container list command to shell for
 consistency.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
---
 lib/container/list              |  8 +-------
 share/bash-completion/container | 18 +++++++++---------
 share/man/container-list.1.txt  |  8 ++++----
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/lib/container/list b/lib/container/list
index a21a593..7e27a5f 100755
--- a/lib/container/list
+++ b/lib/container/list
@@ -118,7 +118,7 @@ List ()
 			done
 			;;
 
-		short)
+		shell)
 			printf "${CONTAINER}\n"
 			;;
 	esac
@@ -139,9 +139,6 @@ ${WHITE} ${NORMAL} Container                                      IPv4 Address(e
 EOF
 
 		;;
-
-	short)
-		;;
 esac
 
 CONTAINERS="$(cd "${MACHINES}" 2>/dev/null && find -maxdepth 1 -type d -and -not -name '.container-tools' -and -not -name 'container-tools' -and -not -name 'lost+found' -and -not -name '.snap' -and -not -name '.snapshot' -printf '%P\n' | sort)"
@@ -221,7 +218,4 @@ cat << EOF
 EOF
 
 		;;
-
-	short)
-		;;
 esac
diff --git a/share/bash-completion/container b/share/bash-completion/container
index 5ec4741..9dcdbc3 100644
--- a/share/bash-completion/container
+++ b/share/bash-completion/container
@@ -47,7 +47,7 @@ _container()
 				*)
 					case "${prev}" in
 						-n|--name)
-							opts=$(container list -s -f short)
+							opts=$(container list -s -f shell)
 							COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
 							return 0
 							;;
@@ -93,7 +93,7 @@ _container()
 				*)
 					case "${prev}" in
 						-n|--name)
-							opts=$(container list -s -f short)
+							opts=$(container list -s -f shell)
 							COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
 							return 0
 							;;
@@ -113,7 +113,7 @@ _container()
 				*)
 					case "${prev}" in
 						-n|--name)
-							opts=$(container list -a -f short)
+							opts=$(container list -a -f shell)
 							COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
 							return 0
 							;;
@@ -139,7 +139,7 @@ _container()
 							;;
 
 						-f|--format)
-							opts="cli short"
+							opts="cli shell"
 							COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
 							return 0
 							;;
@@ -159,7 +159,7 @@ _container()
 				*)
 					case "${prev}" in
 						-n|--name)
-							opts=$(container list -t -f short)
+							opts=$(container list -t -f shell)
 							COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
 							return 0
 							;;
@@ -179,7 +179,7 @@ _container()
 				*)
 					case "${prev}" in
 						-n|--name)
-							opts=$(container list -s -f short)
+							opts=$(container list -s -f shell)
 							COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
 							return 0
 							;;
@@ -199,7 +199,7 @@ _container()
 				*)
 					case "${prev}" in
 						-n|--name)
-							opts=$(container list -t -f short)
+							opts=$(container list -t -f shell)
 							COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
 							return 0
 							;;
@@ -219,7 +219,7 @@ _container()
 				*)
 					case "${prev}" in
 						-n|--name)
-							opts=$(container list -t -f short)
+							opts=$(container list -t -f shell)
 							COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
 							return 0
 							;;
@@ -239,7 +239,7 @@ _container()
 				*)
 					case "${prev}" in
 						-n|--name)
-							opts=$(container list -s -f short)
+							opts=$(container list -s -f shell)
 							COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
 							return 0
 							;;
diff --git a/share/man/container-list.1.txt b/share/man/container-list.1.txt
index d69a958..53603db 100644
--- a/share/man/container-list.1.txt
+++ b/share/man/container-list.1.txt
@@ -47,7 +47,7 @@ The following container options are available, defaults to *--started --stopped*
 	List all available container (started, stopped, and other).
 
 *-f, --format='FORMAT'*::
-	Use format to list container. Currently available formats are 'cli' (default) or 'short'.
+	Use format to list container. Currently available formats are 'cli' (default) or 'shell'.
 
 *-h, --host='HOSTNAME'*::
 	List only container that are enabled for automatic start on the specified hostname. Defaults to list containers of the local system only. Using 'all' shows all container regardless of any automatic start configuration.
@@ -66,12 +66,12 @@ EXAMPLES
 *List all started and stopped containers of the local system:*::
 	sudo container list
 
-*List all started and stopped containers of the local system as a machine-readable list:*::
-	sudo container list -f short
-
 *List all started and other containers:*::
 	sudo container list -s -o
 
+*Create a shell export of all started and stopped containers:*::
+	sudo container list -f shell
+
 
 SEE ALSO
 --------
-- 
cgit v1.2.3