android, fix variable names, add idempotency to module changes.
This commit is contained in:
@@ -37,9 +37,9 @@
|
|||||||
|
|
||||||
- name: Workstation | Linux | Software | Android | Facts [05]
|
- name: Workstation | Linux | Software | Android | Facts [05]
|
||||||
set_fact:
|
set_fact:
|
||||||
android_sdkmanager2_list: "{{ android_sdkmanager }} list"
|
android_sdkmanager2_list: "{{ android_sdkmanager2 }} list"
|
||||||
android_sdkmanager2_install: "{{ android_sdkmanager }} install"
|
android_sdkmanager2_install: "{{ android_sdkmanager2 }} install"
|
||||||
android_sdkmanager2_remove: "{{ android_sdkmanager }} remove"
|
android_sdkmanager2_remove: "{{ android_sdkmanager2 }} remove"
|
||||||
|
|
||||||
# Regarding images to download; the `default` is the smallest, then `playstore`.
|
# Regarding images to download; the `default` is the smallest, then `playstore`.
|
||||||
# The `google_apis` images are significantly larger than the `playstore` option.
|
# The `google_apis` images are significantly larger than the `playstore` option.
|
||||||
@@ -255,9 +255,12 @@
|
|||||||
shell: |
|
shell: |
|
||||||
if ! {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
|
if ! {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
|
||||||
yes | {{ android_sdkmanager2_install }} '{{ item }}'
|
yes | {{ android_sdkmanager2_install }} '{{ item }}'
|
||||||
|
echo "INSTALLED"
|
||||||
fi
|
fi
|
||||||
loop: "{{ android_downloads_required }}"
|
loop: "{{ android_downloads_required }}"
|
||||||
become_user: "{{ user }}"
|
become_user: "{{ user }}"
|
||||||
|
register: check_required
|
||||||
|
changed_when: "'INSTALLED' in check_required.stdout"
|
||||||
when: coding == true
|
when: coding == true
|
||||||
|
|
||||||
# Add more versions for testing across all the important platforms.
|
# Add more versions for testing across all the important platforms.
|
||||||
@@ -265,9 +268,12 @@
|
|||||||
shell: |
|
shell: |
|
||||||
if ! {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
|
if ! {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
|
||||||
yes | {{ android_sdkmanager2_install }} '{{ item }}'
|
yes | {{ android_sdkmanager2_install }} '{{ item }}'
|
||||||
|
echo "INSTALLED"
|
||||||
fi
|
fi
|
||||||
loop: "{{ android_downloads_additional }}"
|
loop: "{{ android_downloads_additional }}"
|
||||||
become_user: "{{ user }}"
|
become_user: "{{ user }}"
|
||||||
|
register: check_additional
|
||||||
|
changed_when: "'INSTALLED' in check_additional.stdout"
|
||||||
when: coding == true
|
when: coding == true
|
||||||
and sdks == true
|
and sdks == true
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user