Compare commits

...
7 Commits
2 changed files with 53 additions and 13 deletions

No files matched your search

+2 -1
View File
@@ -218,8 +218,9 @@ if [[ "$ansible_exists" == 0 ]]; then
elif [[ -e "$lock_file" ]]; then
echo "Playbook not being executed. Removing lock file."
sudo mv -v "$lock_file" "${lock_file}.disabled"
else
echo "- No processes or lockfile found."
fi
echo "- Verified!"
echo "Provisioning Ansible..."
if [[ "$local" == "Y" ]]; then
+51 -12
View File
@@ -37,9 +37,9 @@
- name: Workstation | Linux | Software | Android | Facts [05]
set_fact:
android_sdkmanager2_list: "{{ android_sdkmanager }} list"
android_sdkmanager2_install: "{{ android_sdkmanager }} install"
android_sdkmanager2_remove: "{{ android_sdkmanager }} remove"
android_sdkmanager2_list: "{{ android_sdkmanager2 }} list"
android_sdkmanager2_install: "{{ android_sdkmanager2 }} install"
android_sdkmanager2_remove: "{{ android_sdkmanager2 }} remove"
# Regarding images to download; the `default` is the smallest, then `playstore`.
# The `google_apis` images are significantly larger than the `playstore` option.
@@ -95,11 +95,9 @@
### 30 ###
- system-images/android-30/default/x86_64
android_downloads_unused:
### 37 ###
### 36 ###
- build-tools/36.0.0
- platforms/android-36
- sources/android-36
- system-images/android-36/default/x86_64
- system-images/android-36/google_apis_playstore/x86_64
- system-images/android-36/google_apis/x86_64
### 35 ###
@@ -255,8 +253,17 @@
shell: |
if ! {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
yes | {{ android_sdkmanager2_install }} '{{ item }}'
if {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
echo "INSTALLED"
else
echo "FAILED"
fi
fi
loop: "{{ android_downloads_required }}"
register: install_required
changed_when: "'INSTALLED' in install_required.stdout"
failed_when: "'FAILED' in install_required.stdout"
become_user: "{{ user }}"
when: coding == true
@@ -265,31 +272,63 @@
shell: |
if ! {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
yes | {{ android_sdkmanager2_install }} '{{ item }}'
if {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
echo "INSTALLED"
else
echo "FAILED"
fi
fi
loop: "{{ android_downloads_additional }}"
register: install_additional
changed_when: "'INSTALLED' in install_additional.stdout"
failed_when: "'FAILED' in install_additional.stdout"
become_user: "{{ user }}"
when: coding == true
and sdks == true
# Remove extra downloads if system is not meant for full amount of testing.
- name: Workstation | Linux | Software | Android | Uninstall | Additional Modules
shell: "yes | {{ android_sdkmanager2_remove }} '{{ item }}'"
shell: |
if {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
yes | {{ android_sdkmanager2_remove }} '{{ item }}'
if ! {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
echo "REMOVED"
else
echo "FAILED"
fi
fi
loop: "{{ android_downloads_additional }}"
register: remove_additional
changed_when: "'REMOVED' in remove_additional.stdout"
failed_when: "'FAILED' in remove_additional.stdout"
become_user: "{{ user }}"
when: coding != true
or sdks != true
ignore_errors: yes
# Remove any versions which used to be part of this script and no longer used.
- name: Workstation | Linux | Software | Android | Uninstall | Unused Modules
shell: "yes | {{ android_sdkmanager2_remove }} '{{ item }}'"
shell: |
if {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
yes | {{ android_sdkmanager2_remove }} '{{ item }}'
if ! {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
echo "REMOVED"
else
echo "FAILED"
fi
fi
loop: "{{ android_downloads_unused }}"
register: remove_unused
changed_when: "'REMOVED' in remove_unused.stdout"
failed_when: "'FAILED' in remove_unused.stdout"
become_user: "{{ user }}"
when: coding == true
# Report the currently installed packges.
- name: Workstation | Linux | Software | Android | Report Modules
shell: "{{ android_sdkmanager2_list }} > {{ android_report_file }}"
shell: "{{ android_sdkmanager2_list }} --all > {{ android_report_file }}"
become_user: "{{ user }}"
when: coding == true
@@ -330,7 +369,7 @@
loop:
- "{{ user_root.home }}"
- "{{ user_user.home }}"
ignore_errors: yes
ignore_errors: true
when: coding == true
and user_root.home != ""
and user_user.home != ""
@@ -347,7 +386,7 @@
loop:
- "{{ user_root.home }}"
- "{{ user_user.home }}"
ignore_errors: yes
ignore_errors: true
when: coding == true
and user_root.home != ""
and user_user.home != ""