summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-12-11 10:42:29 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-12-11 10:47:12 +0000
commit36e09652b1ea35f3c4b7e92e0847d0c8eea3323b (patch)
tree06ec7c52712b9246ab40c8b906c468894e144414
parentSorting format code in container list command. (diff)
downloadcompute-tools-36e09652b1ea35f3c4b7e92e0847d0c8eea3323b.tar.xz
compute-tools-36e09652b1ea35f3c4b7e92e0847d0c8eea3323b.zip
Renaming full format in container list command to cli for consistency.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to '')
-rwxr-xr-xlib/container/list8
-rw-r--r--share/bash-completion/container2
-rw-r--r--share/man/container-list.1.txt2
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/container/list b/lib/container/list
index 3dd1ecf..a21a593 100755
--- a/lib/container/list
+++ b/lib/container/list
@@ -93,14 +93,14 @@ Usage ()
Parameters "${@}"
LIST="${LIST:-started stopped}"
-FORMAT="${FORMAT:-full}"
+FORMAT="${FORMAT:-cli}"
HOST="${HOST:-$(hostname -f)}"
# Run
List ()
{
case "${FORMAT}" in
- full)
+ cli)
FIRST_LINE="true"
for ADDRESS in ${ADDRESSES}
@@ -125,7 +125,7 @@ List ()
}
case "${FORMAT}" in
- full)
+ cli)
RED="$(tput setaf 1)$(tput bold)"
GREEN="$(tput setaf 2)$(tput bold)"
YELLOW="$(tput setaf 3)$(tput bold)"
@@ -214,7 +214,7 @@ do
done
case "${FORMAT}" in
- full)
+ cli)
cat << EOF
--------------------------------------------------------------------------------
diff --git a/share/bash-completion/container b/share/bash-completion/container
index e49311a..5ec4741 100644
--- a/share/bash-completion/container
+++ b/share/bash-completion/container
@@ -139,7 +139,7 @@ _container()
;;
-f|--format)
- opts="short full"
+ opts="cli short"
COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
return 0
;;
diff --git a/share/man/container-list.1.txt b/share/man/container-list.1.txt
index 9e69fba..d69a958 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 'short' or 'full' (default).
+ Use format to list container. Currently available formats are 'cli' (default) or 'short'.
*-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.