diff options
| -rw-r--r-- | CHANGELOG.txt | 10 | ||||
| -rw-r--r-- | VERSION.txt | 2 | ||||
| -rwxr-xr-x | bin/container | 1 | ||||
| -rwxr-xr-x | libexec/container/auto | 3 | ||||
| -rwxr-xr-x | libexec/container/build | 7 | ||||
| -rwxr-xr-x | libexec/container/console | 3 | ||||
| -rwxr-xr-x | libexec/container/enter | 3 | ||||
| -rwxr-xr-x | libexec/container/get | 3 | ||||
| -rwxr-xr-x | libexec/container/info | 3 | ||||
| -rwxr-xr-x | libexec/container/key | 3 | ||||
| -rwxr-xr-x | libexec/container/limit | 3 | ||||
| -rwxr-xr-x | libexec/container/list | 3 | ||||
| -rwxr-xr-x | libexec/container/log | 3 | ||||
| -rwxr-xr-x | libexec/container/move | 3 | ||||
| -rwxr-xr-x | libexec/container/remove | 3 | ||||
| -rwxr-xr-x | libexec/container/restart | 3 | ||||
| -rwxr-xr-x | libexec/container/run | 3 | ||||
| -rwxr-xr-x | libexec/container/start | 3 | ||||
| -rwxr-xr-x | libexec/container/status | 3 | ||||
| -rwxr-xr-x | libexec/container/stop | 3 | ||||
| -rwxr-xr-x | libexec/container/top | 3 | ||||
| -rwxr-xr-x | libexec/container/update | 7 | ||||
| -rw-r--r-- | share/bash-completion/container | 2 |
23 files changed, 74 insertions, 6 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index f52f6f6..c27b455 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,13 @@ +2021-08-04 Daniel Baumann <daniel.baumann@open-infrastructure.net> + + * Releasing version 20210804. + + [ Daniel Baumann ] + * Updating container update options in bash-completion. + * Fixing full-upgrade option in container update command. + * Harmonizing usage messages over all container commands with manpage references. + * Harmonizing parameter and usage in container build command. + 2021-07-27 Daniel Baumann <daniel.baumann@open-infrastructure.net> * Releasing version 20210727. diff --git a/VERSION.txt b/VERSION.txt index 781a3b1..856144c 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -20210727 +20210804 diff --git a/bin/container b/bin/container index 172caec..68e3965 100755 --- a/bin/container +++ b/bin/container @@ -34,6 +34,7 @@ then echo "Usage: ${PROGRAM} COMMAND1,COMMAND2,... [COMMON_OPTIONS]" >&2 echo echo "See ${PROGRAM}(1) and ${PROJECT}(7) for more information." + exit 1 fi diff --git a/libexec/container/auto b/libexec/container/auto index 0c9d136..de5f292 100755 --- a/libexec/container/auto +++ b/libexec/container/auto @@ -76,6 +76,9 @@ Parameters () Usage () { echo "Usage: ${PROGRAM} ${COMMAND} -f|--force -s|--start -t|--stop" >&2 + echo + echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information." + exit 1 } diff --git a/libexec/container/build b/libexec/container/build index b64af48..d6c938c 100755 --- a/libexec/container/build +++ b/libexec/container/build @@ -32,7 +32,7 @@ CONFIG_TEMPLATE="/usr/share/${SOFTWARE}/config/container.conf.in" Parameters () { - GETOPT_LONGOPTIONS="name:,cnt.container-server:,cnt.overlay:,cnt.overlay-options:,start:,bind:,bind-ro:,capability:,drop-capability:,script:,verbose," + GETOPT_LONGOPTIONS="name:,cnt.auto:,cnt.container-server:,cnt.overlay:,cnt.overlay-options:,cnt.start:,bind:,bind-ro:,capability:,drop-capability:,script:,verbose," GETOPT_OPTIONS="n:,b:,c:,d:,s:,v," PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})" @@ -123,7 +123,10 @@ Parameters () Usage () { - echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [--cnt.container-server=true|false|FQDN] [--cnt.overlay=DIRECTORY_LOWER:DIRECTORY_UPPER:DIRECTORY_WORK:DIRECTORY_MERGED] [--cnt.overlay-options=OPTION[,OPTION]] [--cnt.start=OPTION[,OPTION]] [-b|--bind DIRECTORY:DIRECTORY[:OPTIONS]] [--bind-ro DIRECTORY:DIRECTORY[:OPTIONS]] [-c|--capability CAPABILITY[,CAPABILITY]] [-d|--drop-capability DROP_CAPABILITY[,DROP_CAPABILITY]] [-s|--script SCRIPT] [-v|--verbose] [-- SCRIPT_OPTIONS]" >&2 + echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [--cnt.auto=true|false|force-true] [--cnt.container-server=true|false|FQDN] [--cnt.overlay=DIRECTORY_LOWER:DIRECTORY_UPPER:DIRECTORY_WORK:DIRECTORY_MERGED] [--cnt.overlay-options=OPTION[,OPTION]] [--cnt.start=OPTION[,OPTION]] [-b|--bind DIRECTORY:DIRECTORY[:OPTIONS]] [--bind-ro DIRECTORY:DIRECTORY[:OPTIONS]] [-c|--capability CAPABILITY[,CAPABILITY]] [-d|--drop-capability DROP_CAPABILITY[,DROP_CAPABILITY]] [-s|--script SCRIPT] [-v|--verbose] [-- SCRIPT_OPTIONS]" >&2 + echo + echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information." + exit 1 } diff --git a/libexec/container/console b/libexec/container/console index ce53712..31da60d 100755 --- a/libexec/container/console +++ b/libexec/container/console @@ -66,6 +66,9 @@ Parameters () Usage () { echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME" >&2 + echo + echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information." + exit 1 } diff --git a/libexec/container/enter b/libexec/container/enter index 2664fdc..604d714 100755 --- a/libexec/container/enter +++ b/libexec/container/enter @@ -66,6 +66,9 @@ Parameters () Usage () { echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME" >&2 + echo + echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information." + exit 1 } diff --git a/libexec/container/get b/libexec/container/get index 1005f89..2b41ba8 100755 --- a/libexec/container/get +++ b/libexec/container/get @@ -124,6 +124,9 @@ Parameters () Usage () { echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [--cnt.container-server=true|false|FQDN] [--cnt.overlay=DIRECTORY_LOWER:DIRECTORY_UPPER:DIRECTORY_WORK:DIRECTORY_MERGED] [--cnt.overlay-options=OPTION[,OPTION]] [--cnt.start=OPTION[,OPTION]] [-b|--bind DIRECTORY:DIRECTORY[:OPTIONS]] [--bind-ro DIRECTORY:DIRECTORY[:OPTIONS]] [-c|--capability CAPABILITY[,CAPABILITY]] [-d|--drop-capability DROP_CAPABILITY[,DROP_CAPABILITY]] [-s|--script SCRIPT] [-v|--verbose] [-- SCRIPT_OPTIONS]" >&2 + echo + echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information." + exit 1 } diff --git a/libexec/container/info b/libexec/container/info index 63c42ff..d030780 100755 --- a/libexec/container/info +++ b/libexec/container/info @@ -84,6 +84,9 @@ Parameters () Usage () { echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [--status] [--os] [--ip]" >&2 + echo + echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information." + exit 1 } diff --git a/libexec/container/key b/libexec/container/key index 19b7fa9..e35c56c 100755 --- a/libexec/container/key +++ b/libexec/container/key @@ -77,6 +77,9 @@ Parameters () Usage () { echo "Usage: ${PROGRAM} ${COMMAND} [-a|--add KEY_FILE|KEY_ID] [-l|--list] [-r|--remove KEY|KEY_ID]" >&2 + echo + echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information." + exit 1 } diff --git a/libexec/container/limit b/libexec/container/limit index 6323a42..2c87b78 100755 --- a/libexec/container/limit +++ b/libexec/container/limit @@ -106,6 +106,9 @@ Parameters () Usage () { echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [--blockio-device-weight \"DEVICE WEIGHT\"] [--blockio-read-bandwidth \"DEVICE BYTES\"] [-b|--blockio-weight WEIGHT] [--blockio-write-bandwidth \"DEVICE BYTES\"] [-c|--cpu-quota QUOTA] [--cpu-shares SHARES] [-m|--memory-limit BYTES] [-t|--tasks-max NUMBER]" >&2 + echo + echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information." + exit 1 } diff --git a/libexec/container/list b/libexec/container/list index 6567afb..c112cc8 100755 --- a/libexec/container/list +++ b/libexec/container/list @@ -109,6 +109,9 @@ Parameters () Usage () { echo "Usage: ${PROGRAM} ${COMMAND} [-a|--all] [--csv-separator SEPARATOR] [--format FORMAT] [-h|--host HOSTNAME] [--nwdiag-color COLOR] [--nwdiag-label LABEL] [-o|--other] [-s|--started] [-t|--stopped]" >&2 + echo + echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information." + exit 1 } diff --git a/libexec/container/log b/libexec/container/log index e514391..9d11fd6 100755 --- a/libexec/container/log +++ b/libexec/container/log @@ -76,6 +76,9 @@ Parameters () Usage () { echo "Usage: ${PROGRAM} ${COMMAND} [-n|--name NAME] [-d|--date DATE|today|today-N|yesterday] [-u|--user USER]" >&2 + echo + echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information." + exit 1 } diff --git a/libexec/container/move b/libexec/container/move index a76cde1..d41c995 100755 --- a/libexec/container/move +++ b/libexec/container/move @@ -77,6 +77,9 @@ Parameters () Usage () { echo "Usage: ${PROGRAM} ${COMMAND} [-f|--force] -n|--new NAME -o|--old NAME" >&2 + echo + echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information." + exit 1 } diff --git a/libexec/container/remove b/libexec/container/remove index 3205c32..03303a7 100755 --- a/libexec/container/remove +++ b/libexec/container/remove @@ -90,6 +90,9 @@ Parameters () Usage () { echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [--allow-stop] [-f|--force] [-v|--verbose]" >&2 + echo + echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information." + exit 1 } diff --git a/libexec/container/restart b/libexec/container/restart index 922629d..c172731 100755 --- a/libexec/container/restart +++ b/libexec/container/restart @@ -75,6 +75,9 @@ Parameters () Usage () { echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [-v|--verbose]" >&2 + echo + echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information." + exit 1 } diff --git a/libexec/container/run b/libexec/container/run index bf8d0a7..4daeaa2 100755 --- a/libexec/container/run +++ b/libexec/container/run @@ -66,6 +66,9 @@ Parameters () Usage () { echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME -- COMMAND" >&2 + echo + echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information." + exit 1 } diff --git a/libexec/container/start b/libexec/container/start index 08c3611..f899446 100755 --- a/libexec/container/start +++ b/libexec/container/start @@ -99,6 +99,9 @@ Parameters () Usage () { echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [-f|--force]" >&2 + echo + echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information." + exit 1 } diff --git a/libexec/container/status b/libexec/container/status index 9c3a076..5b930a7 100755 --- a/libexec/container/status +++ b/libexec/container/status @@ -67,6 +67,9 @@ Parameters () Usage () { echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME" >&2 + echo + echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information." + exit 1 } diff --git a/libexec/container/stop b/libexec/container/stop index 4310a35..98b2afa 100755 --- a/libexec/container/stop +++ b/libexec/container/stop @@ -93,6 +93,9 @@ Parameters () Usage () { echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [-f|--force] [-v|--verbose]" >&2 + echo + echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information." + exit 1 } diff --git a/libexec/container/top b/libexec/container/top index c846000..20e2a29 100755 --- a/libexec/container/top +++ b/libexec/container/top @@ -63,6 +63,9 @@ Parameters () Usage () { echo "Usage: ${PROGRAM} ${COMMAND} [-d|--delay DELAY]" >&2 + echo + echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information." + exit 1 } diff --git a/libexec/container/update b/libexec/container/update index bb175d1..4c23423 100755 --- a/libexec/container/update +++ b/libexec/container/update @@ -29,7 +29,7 @@ HOOKS="/etc/${SOFTWARE}/hooks" Parameters () { GETOPT_LONGOPTIONS="name:,full-upgrade,autoremove,purge,yes," - GETOPT_OPTIONS="n:,r,p,y," + GETOPT_OPTIONS="n:,f,r,p,y," PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})" @@ -85,6 +85,9 @@ Parameters () Usage () { echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [-f|--full-upgrade] [-r|--autoremove] [-p|--purge] [-y|--yes]" >&2 + echo + echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information." + exit 1 } @@ -120,7 +123,7 @@ do case "${FULL_UPGRADE}" in true) - container run -n ${NAME} -- "apt update && ${YES} full-upgrade" + container run -n ${NAME} -- "apt update && apt ${YES} full-upgrade" ;; esac diff --git a/share/bash-completion/container b/share/bash-completion/container index dfb7ad5..24205d7 100644 --- a/share/bash-completion/container +++ b/share/bash-completion/container @@ -343,7 +343,7 @@ _container() ;; *) - opts="-n --name -y --yes" + opts="-n --name -f --full-upgrade -r --autoremove -p --purge --y --yes" COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) return 0 ;; |