From a0af4d1d29fdd2b479c9ff23b34faf8315a3d373 Mon Sep 17 00:00:00 2001 From: Blallo Date: Tue, 23 Feb 2021 18:45:51 +0100 Subject: [PATCH] Make it work also with arm --- defaults/main.yml | 8 +++++--- tasks/main.yml | 12 ++++++++---- tasks/starship_arm.yml | 11 +++++++++++ tasks/{starship.yml => starship_x64.yml} | 6 ++---- 4 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 tasks/starship_arm.yml rename tasks/{starship.yml => starship_x64.yml} (74%) diff --git a/defaults/main.yml b/defaults/main.yml index e562c41..18d65a9 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,4 +1,6 @@ --- -zsh_chic: - antibody: false - starship: false +zsh_chic_antibody: false +zsh_chic_starship: false +zsh_chic_bat_version: 0.17.1 +zsh_chic_arch: amd64 +zsh_chic_starship_version: 0.47.0 diff --git a/tasks/main.yml b/tasks/main.yml index 97cbe2c..e1cc49e 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -13,20 +13,24 @@ - name: Obtain bat .deb package get_url: - url: https://github.com/sharkdp/bat/releases/download/v0.13.0/bat_0.13.0_amd64.deb - dest: /tmp/bat_0.13.0_amd64.deb + url: "https://github.com/sharkdp/bat/releases/download/v{{ zsh_chic_bat_version }}/bat_{{ zsh_chic_bat_version }}_{{ zsh_chic_arch }}.deb" + dest: "/tmp/bat_{{ zsh_chic_bat_version }}_amd64.deb" owner: root group: root mode: 0755 register: new_bat_deb - name: Install bat - shell: dpkg -i /tmp/bat_0.13.0_amd64.deb + shell: "dpkg -i /tmp/bat_{{ zsh_chic_bat_version }}_amd64.deb" when: new_bat_deb is defined and new_bat_deb.changed - include_tasks: antibody.yml -- include_tasks: starship.yml +- include_tasks: starship_x64.yml + when: zsh_chic_arch == 'amd64' + +- include_tasks: starship_arm.yml + when: false # There is no binary for arm - include_tasks: powerline.yml diff --git a/tasks/starship_arm.yml b/tasks/starship_arm.yml new file mode 100644 index 0000000..56d0ee9 --- /dev/null +++ b/tasks/starship_arm.yml @@ -0,0 +1,11 @@ +--- +- name: Download starship installer + get_url: + url: https://starship.rs/install.sh + dest: /root/starship.sh + owner: root + group: root + mode: 0755 + +- name: Install starship (via installer) + shell: /root/starship.sh -y diff --git a/tasks/starship.yml b/tasks/starship_x64.yml similarity index 74% rename from tasks/starship.yml rename to tasks/starship_x64.yml index ac024ff..55f8351 100644 --- a/tasks/starship.yml +++ b/tasks/starship_x64.yml @@ -1,13 +1,11 @@ --- -- name: Download starship binary +- name: Download starship binary (x64) get_url: - url: https://github.com/starship/starship/releases/download/{{ version }}/starship-x86_64-unknown-linux-gnu.tar.gz + url: https://github.com/starship/starship/releases/download/v{{ zsh_chic_starship_version }}/starship-x86_64-unknown-linux-gnu.tar.gz dest: /root/starship.tar.gz owner: root group: root mode: 0755 - vars: - version: "v0.39.0" - name: Extract and install starship binary unarchive: