[systemd-devel] [PATCH 1/3] zsh-completion: add missing completions for machinectl

[Zbigniew Jędrzejewski-Szmek]

On Wed, Apr 22, 2015 at 03:52:59PM -0700, Lukas Rusak wrote:
> Appologies, I'm still getting used to this mailing list thing and using git send-email
> 
> ---
>  shell-completion/zsh/_machinectl | 84 +++++++++++++++++++++++++++++++++-------
>  1 file changed, 70 insertions(+), 14 deletions(-)
> 
> diff --git a/shell-completion/zsh/_machinectl b/shell-completion/zsh/_machinectl
> index c666b7e..a81c5c7 100644
> --- a/shell-completion/zsh/_machinectl
> +++ b/shell-completion/zsh/_machinectl
> @@ -1,5 +1,20 @@
>  #compdef machinectl
>  
> +__get_available_machines () {
> +    machinectl --no-legend list-images | awk '{print $1}' |  {while read -r a b; do echo $a; done;}

I think this was supposed to be:

   machinectl --no-legend list-images | {while read -r a b; do echo $a; done;}

I fixed it up here and will push in a moment.

> +}
> +
> +_available_machines() {
> +    local -a _machines
> +    _machines=("${(fo)$(__get_available_machines)}")
> +    typeset -U _machines
> +    if [[ -n "$_machines" ]]; then
> +        _describe 'machines' _machines
> +    else
> +    	_message 'no machines'
> +    fi
> +}
> +
>  (( $+functions[_machinectl_command] )) || _machinectl_command()
>  {
>    local -a _machinectl_cmds
> @@ -7,23 +22,55 @@
>      "list:List currently running VMs/containers"
>      "status:Show VM/container status"
>      "show:Show properties of one or more VMs/containers"
> +    "start:Start container as a service"
>      "login:Get a login prompt on a VM/container"
> +    "enable:Enable automatic container start at boot"
> +    "disable:Disable automatic container start at boot"
>      "poweroff:Power off one or more VMs/containers"
>      "reboot:Reboot one or more VMs/containers"
>      "terminate:Terminate one or more VMs/containers"
>      "kill:Send signal to process or a VM/container"
> +    "copy-to:Copy files from the host to a container"
> +    "copy-from:Copy files from a container to the host"
> +    "bind:Bind mount a path from the host into a container"
> +
> +    "list-images:Show available container and VM images"
> +    "image-status:Show image details"
> +    "show-image:Show properties of image"
> +    "clone:Clone an image"
> +    "rename:Rename an image"
> +    "read-only:Mark or unmark image read-only"
> +    "remove:Remove an image"
> +
> +    "pull-tar:Download a TAR container image"
> +    "pull-raw:Download a RAW container or VM image"
> +    "pull-dkr:Download a DKR container image"
> +    "list-transfers:Show list of downloads in progress"
> +    "cancel-transfer:Cancel a download"
>    )
> +
>    if (( CURRENT == 1 )); then
>      _describe -t commands 'machinectl command' _machinectl_cmds || compadd "$@"
>    else
>      local curcontext="$curcontext"
>      cmd="${${_machinectl_cmds[(r)$words[1]:*]%%:*}}"
>      if (( $#cmd )); then
> -      case $cmd in
> -        list) msg="no options" ;;
> -        *)
> -          _sd_machines
> -      esac
> +      if (( CURRENT == 2 )); then
> +        case $cmd in
> +          list*|cancel-transfer|pull-tar|pull-raw|pull-dkr)
> +            msg="no options" ;;
> +          start)
> +            _available_machines ;;
> +          *)
> +            _sd_machines
> +        esac
> +      else
> +        case $cmd in
> +          copy-to|copy-from|bind)
> +            _files ;;
> +          *) msg="no options"
> +        esac
> +      fi
>      else
>        _message "no more options"
>      fi
> @@ -33,13 +80,22 @@
>  _arguments \
>    {-h,--help}'[Prints a short help text and exits.]' \
>    '--version[Prints a short version string and exits.]' \
> -  \*{-p+,--property=}'[Limit output to specified property.]:property:(Name Id Timestamp TimestampMonotonic Service Scope Leader Class State RootDirectory)' \
> -  {-a,--all}'[Show all proerties]' \
> -  (-l,--full)'[Do not ellipsize cgroup members]' \
> -  '--no-pager[Do not pipe output into a pager]' \
> -  '--no-ask-password[Do not ask for system passwords]' \
> -  '--kill-who=[Who to send signal to]:killwho:(leader all)' \
> -  {-s+,--signal=}'[Which signal to send]:signal:_signals' \
> -  {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
> -  {-P,--privileged}'[Acquire privileges before execution]' \
> +  '--no-pager[Do not pipe output into a pager.]' \
> +  '--no-legend[Do not show the headers and footers.]' \
> +  '--no-ask-password[Do not ask for system passwords.]' \
> +  {-H+,--host=}'[Operate on remote host.]:userathost:_sd_hosts_or_user_at_host' \
> +  {-M+,--machine=}'[Operate on local container.]:machine:_sd_machines' \
> +  {-p+,--property=}'[Limit output to specified property.]:property:(Name Id Timestamp TimestampMonotonic Service Scope Leader Class State RootDirectory)' \
> +  {-a,--all}'[Show all proerties.]' \
> +  {-q,--quiet}'[Suppress output.]' \
> +  {-l,--full}'[Do not ellipsize cgroup members.]' \
> +  '--kill-who=[Who to send signal to.]:killwho:(leader all)' \
> +  {-s+,--signal=}'[Which signal to send.]:signal:_signals' \
> +  '--read-only[Create read-only bind mount.]' \
> +  '--mkdir[Create directory before bind mounting, if missing.]' \
> +  {-n+,--lines=}'[Number of journal entries to show.]:integer' \
> +  {-o+,--output=}'[Change journal output mode.]:output modes:_sd_outputmodes' \
> +  '--verify=[Verification mode for downloaded images.]:verify:(no checksum signature)' \
> +  '--force[Download image even if already exists.]' \
> +  '--dkr-index-url=[Specify the index URL to use for DKR image downloads.]' \
>    '*::machinectl command:_machinectl_command'

Zbyszek