diff --git a/tasks/rubies.yml b/tasks/rubies.yml index 5e49d46..e8e6700 100644 --- a/tasks/rubies.yml +++ b/tasks/rubies.yml @@ -1,6 +1,6 @@ --- - name: detect if rubies are installed - command: '{{ rvm1 }} {{ item }} do true' + command: '{{ ansible_local.rvm1.rvm }} {{ item }} do true' changed_when: false failed_when: false register: detect_rubies @@ -8,30 +8,30 @@ when: rvm1_rubies - name: ensure rubies are installed - command: '{{ rvm1 }} install {{ item.item }}' + command: '{{ ansible_local.rvm1.rvm }} install {{ item.item }}' when: rvm1_rubies and item.rc != 0 with_items: detect_rubies.results - name: detect default ruby version - command: '{{ rvm1 }} alias list default' + command: '{{ ansible_local.rvm1.rvm }} alias list default' changed_when: false register: detect_default_ruby_version - name: ensure default ruby is selected - command: '{{ rvm1 }} alias create default {{ rvm1_default_ruby_version }}' - when: detect_default_ruby_version.stdout == '' or rvm1_default_ruby_version not in detect_default_ruby_version.stdout + command: '{{ ansible_local.rvm1.rvm }} alias create default {{ ansible_local.rvm1.default_ruby_version }}' + when: detect_default_ruby_version.stdout == '' or ansible_local.rvm1.default_ruby_version not in detect_default_ruby_version.stdout - name: ensure rvm install path is writable by the set owner:group file: path='{{ rvm1_install_path }}' state=directory recurse=yes owner='{{ rvm1_user }}' group='{{ rvm1_group }}' - name: detect if ruby version can be deleted - command: '{{ rvm1 }} {{ rvm1_delete_ruby }} do true' + command: '{{ ansible_local.rvm1.rvm }} {{ rvm1_delete_ruby }} do true' changed_when: false failed_when: false register: detect_delete_ruby when: rvm1_delete_ruby - name: ensure ruby version is deleted - command: '{{ rvm1 }} remove {{ rvm1_delete_ruby }}' + command: '{{ ansible_local.rvm1.rvm }} remove {{ rvm1_delete_ruby }}' changed_when: false when: rvm1_delete_ruby and detect_delete_ruby.rc == 0 \ No newline at end of file diff --git a/tasks/rvm.yml b/tasks/rvm.yml index c9d4aa0..1dd8847 100644 --- a/tasks/rvm.yml +++ b/tasks/rvm.yml @@ -1,6 +1,6 @@ --- - name: detect rvm binary - stat: path='{{ rvm1 }}' + stat: path='{{ ansible_local.rvm1.rvm }}' register: rvm_binary - name: detect rvm installer @@ -8,7 +8,7 @@ register: rvm_installer - name: detect current rvm version - command: '{{ rvm1 }} version' + command: '{{ ansible_local.rvm1.rvm }} version' changed_when: false register: rvm_current_version when: rvm_binary.stat.exists @@ -39,9 +39,9 @@ when: not rvm_binary.stat.exists - name: ensure rvm is upgraded - shell: '{{ rvm1 }} get stable && {{ rvm1 }} reload' + shell: '{{ ansible_local.rvm1.rvm }} get stable && {{ ansible_local.rvm1.rvm }} reload' when: rvm_binary.stat.exists and rvm_stable_version_number.content | default(rvm1_rvm_stable_version_number) | replace('\n', '') > rvm_current_version.stdout.split()[1] - name: ensure rvm installs ruby dependencies - command: '{{ rvm1 }} autolibs 3' + command: '{{ ansible_local.rvm1.rvm }} autolibs 3' when: not rvm_binary.stat.exists \ No newline at end of file