From 6184e13a8849bedc5574856825c12c8ded64d43b Mon Sep 17 00:00:00 2001 From: Andrew Coleman Date: Mon, 10 May 2021 14:55:35 -0400 Subject: [PATCH] add env var for frawk, use bash directly to install rustup, fix bottom install --- rust.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rust.yml b/rust.yml index 7be8e38..7d4d8d5 100644 --- a/rust.yml +++ b/rust.yml @@ -1,6 +1,6 @@ --- - name: install rustup - command: curl -o t.sh https://sh.rustup.rs -sSf && chmod 700 t.sh && ./t.sh --no-modify-path --verbose -y --default-toolchain stable && rm -f t.sh && ~/.cargo/bin/rustup install toolchain nightly + command: /bin/bash -c "curl -sSf -o rustup_init https://sh.rustup.rs && /bin/bash rustup_init --no-modify-path --verbose -y --default-toolchain stable && rm -f rustup_init && source ~/.cargo/env && rustup install nightly" args: warn: False creates: "{{ ansible_env.HOME }}/.cargo/bin/rustup" @@ -20,8 +20,8 @@ args: creates: "{{ ansible_env.HOME }}/.cargo/bin/bat" -- name: install btm - command: cargo install btm +- name: install bottom + command: cargo install bottom when: ansible_facts['system']|lower == 'linux' args: creates: "{{ ansible_env.HOME }}/.cargo/bin/btm" @@ -63,7 +63,7 @@ creates: "{{ ansible_env.HOME }}/.cargo/bin/frawk" - name: install frawk linux - command: cargo +nightly install frawk + shell: LLVM_SYS_100_PREFIX=/usr/lib64/llvm10 cargo +nightly install frawk when: ansible_facts['system']|lower == 'linux' args: creates: "{{ ansible_env.HOME }}/.cargo/bin/frawk"