From e6b99f038b553bea15489c8e8c9d26043ee6000b Mon Sep 17 00:00:00 2001 From: Sergey Gripinskiy Date: Sat, 11 Sep 2021 20:43:02 +0300 Subject: [PATCH] fix: check bash-completion is installed --- defaults/main.yml | 4 ++-- tasks/docker-compose.yml | 17 +++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 1d3c0b8..c450119 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -14,8 +14,8 @@ docker_install_compose: true docker_compose_version: "1.29.2" docker_compose_url: https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64 docker_compose_path: /usr/local/bin/docker-compose -docker_compose_completion_url: https://raw.githubusercontent.com/docker/compose/{{ docker_compose_version }}/contrib/completion/bash/docker-compose -docker_compose_completion_path: /etc/bash_completion.d/docker-compose +docker_compose_bash_completion_url: https://raw.githubusercontent.com/docker/compose/{{ docker_compose_version }}/contrib/completion/bash/docker-compose +docker_compose_bash_completion_path: /etc/bash_completion.d/docker-compose # Docker repo URL. docker_repo_url: https://download.docker.com/linux diff --git a/tasks/docker-compose.yml b/tasks/docker-compose.yml index ca2de94..8f824c7 100644 --- a/tasks/docker-compose.yml +++ b/tasks/docker-compose.yml @@ -11,7 +11,7 @@ state: absent loop: - "{{ docker_compose_path }}" - - "{{ docker_compose_completion_path }}" + - "{{ docker_compose_bash_completion_path }}" when: > docker_compose_current_version.stdout is defined and docker_compose_version not in docker_compose_current_version.stdout @@ -25,11 +25,16 @@ docker_compose_current_version.stdout is not defined or docker_compose_version not in docker_compose_current_version.stdout -- name: Install Docker Compose command-line completion (if configured) +- name: Gather installed packages in search for bash-completion. + package_facts: + manager: auto + +- name: Install Docker Compose command-line completion for bash (if supported). get_url: - url: "{{ docker_compose_completion_url }}" - dest: "{{ docker_compose_completion_path }}" + url: "{{ docker_compose_bash_completion_url }}" + dest: "{{ docker_compose_bash_completion_path }}" mode: 0644 when: > - docker_compose_current_version.stdout is not defined - or docker_compose_version not in docker_compose_current_version.stdout + 'bash-completion' in ansible_facts.packages and + ( docker_compose_current_version.stdout is not defined + or docker_compose_version not in docker_compose_current_version.stdout )