Compare commits
7
Commits
3d61a7619c
...
e11c6e1e64
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e11c6e1e64 | ||
|
|
7ad7edc82c | ||
|
|
63e7e97076 | ||
|
|
19821939e2 | ||
|
|
07c2f352f1 | ||
|
|
1c8c237bac | ||
|
|
c6875551b2 |
No files matched your search
@@ -218,8 +218,9 @@ if [[ "$ansible_exists" == 0 ]]; then
|
|||||||
elif [[ -e "$lock_file" ]]; then
|
elif [[ -e "$lock_file" ]]; then
|
||||||
echo "Playbook not being executed. Removing lock file."
|
echo "Playbook not being executed. Removing lock file."
|
||||||
sudo mv -v "$lock_file" "${lock_file}.disabled"
|
sudo mv -v "$lock_file" "${lock_file}.disabled"
|
||||||
|
else
|
||||||
|
echo "- No processes or lockfile found."
|
||||||
fi
|
fi
|
||||||
echo "- Verified!"
|
|
||||||
|
|
||||||
echo "Provisioning Ansible..."
|
echo "Provisioning Ansible..."
|
||||||
if [[ "$local" == "Y" ]]; then
|
if [[ "$local" == "Y" ]]; then
|
||||||
|
|||||||
@@ -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.
|
||||||
@@ -95,11 +95,9 @@
|
|||||||
### 30 ###
|
### 30 ###
|
||||||
- system-images/android-30/default/x86_64
|
- system-images/android-30/default/x86_64
|
||||||
android_downloads_unused:
|
android_downloads_unused:
|
||||||
|
### 37 ###
|
||||||
### 36 ###
|
### 36 ###
|
||||||
- build-tools/36.0.0
|
- 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_playstore/x86_64
|
||||||
- system-images/android-36/google_apis/x86_64
|
- system-images/android-36/google_apis/x86_64
|
||||||
### 35 ###
|
### 35 ###
|
||||||
@@ -255,8 +253,17 @@
|
|||||||
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 }}'
|
||||||
|
|
||||||
|
if {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
|
||||||
|
echo "INSTALLED"
|
||||||
|
else
|
||||||
|
echo "FAILED"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
loop: "{{ android_downloads_required }}"
|
loop: "{{ android_downloads_required }}"
|
||||||
|
register: install_required
|
||||||
|
changed_when: "'INSTALLED' in install_required.stdout"
|
||||||
|
failed_when: "'FAILED' in install_required.stdout"
|
||||||
become_user: "{{ user }}"
|
become_user: "{{ user }}"
|
||||||
when: coding == true
|
when: coding == true
|
||||||
|
|
||||||
@@ -265,31 +272,63 @@
|
|||||||
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 }}'
|
||||||
|
|
||||||
|
if {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then
|
||||||
|
echo "INSTALLED"
|
||||||
|
else
|
||||||
|
echo "FAILED"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
loop: "{{ android_downloads_additional }}"
|
loop: "{{ android_downloads_additional }}"
|
||||||
|
register: install_additional
|
||||||
|
changed_when: "'INSTALLED' in install_additional.stdout"
|
||||||
|
failed_when: "'FAILED' in install_additional.stdout"
|
||||||
become_user: "{{ user }}"
|
become_user: "{{ user }}"
|
||||||
when: coding == true
|
when: coding == true
|
||||||
and sdks == true
|
and sdks == true
|
||||||
|
|
||||||
# Remove extra downloads if system is not meant for full amount of testing.
|
# Remove extra downloads if system is not meant for full amount of testing.
|
||||||
- name: Workstation | Linux | Software | Android | Uninstall | Additional Modules
|
- 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 }}"
|
loop: "{{ android_downloads_additional }}"
|
||||||
|
register: remove_additional
|
||||||
|
changed_when: "'REMOVED' in remove_additional.stdout"
|
||||||
|
failed_when: "'FAILED' in remove_additional.stdout"
|
||||||
become_user: "{{ user }}"
|
become_user: "{{ user }}"
|
||||||
when: coding != true
|
when: coding != true
|
||||||
or sdks != true
|
or sdks != true
|
||||||
ignore_errors: yes
|
|
||||||
|
|
||||||
# Remove any versions which used to be part of this script and no longer used.
|
# Remove any versions which used to be part of this script and no longer used.
|
||||||
- name: Workstation | Linux | Software | Android | Uninstall | Unused Modules
|
- 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 }}"
|
loop: "{{ android_downloads_unused }}"
|
||||||
|
register: remove_unused
|
||||||
|
changed_when: "'REMOVED' in remove_unused.stdout"
|
||||||
|
failed_when: "'FAILED' in remove_unused.stdout"
|
||||||
become_user: "{{ user }}"
|
become_user: "{{ user }}"
|
||||||
when: coding == true
|
when: coding == true
|
||||||
|
|
||||||
# Report the currently installed packges.
|
# Report the currently installed packges.
|
||||||
- name: Workstation | Linux | Software | Android | Report Modules
|
- 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 }}"
|
become_user: "{{ user }}"
|
||||||
when: coding == true
|
when: coding == true
|
||||||
|
|
||||||
@@ -330,7 +369,7 @@
|
|||||||
loop:
|
loop:
|
||||||
- "{{ user_root.home }}"
|
- "{{ user_root.home }}"
|
||||||
- "{{ user_user.home }}"
|
- "{{ user_user.home }}"
|
||||||
ignore_errors: yes
|
ignore_errors: true
|
||||||
when: coding == true
|
when: coding == true
|
||||||
and user_root.home != ""
|
and user_root.home != ""
|
||||||
and user_user.home != ""
|
and user_user.home != ""
|
||||||
@@ -347,7 +386,7 @@
|
|||||||
loop:
|
loop:
|
||||||
- "{{ user_root.home }}"
|
- "{{ user_root.home }}"
|
||||||
- "{{ user_user.home }}"
|
- "{{ user_user.home }}"
|
||||||
ignore_errors: yes
|
ignore_errors: true
|
||||||
when: coding == true
|
when: coding == true
|
||||||
and user_root.home != ""
|
and user_root.home != ""
|
||||||
and user_user.home != ""
|
and user_user.home != ""
|
||||||
|
|||||||
Reference in new issue
Block a user