From edaeec1ff25d4801232b419793046bf9a84ebe56 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Mon, 5 Oct 2026 17:01:00 -0700 Subject: [PATCH] android, revert back to doing direct cmmands since result code was not being handled properly. --- tasks/workstation/linux/software/android.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tasks/workstation/linux/software/android.yml b/tasks/workstation/linux/software/android.yml index 264b785..f404855 100644 --- a/tasks/workstation/linux/software/android.yml +++ b/tasks/workstation/linux/software/android.yml @@ -260,10 +260,10 @@ - name: Workstation | Linux | Software | Android | Install | Required Modules ansible.builtin.shell: | set -o pipefail - if [[ {{ android_sdkmanager2_list }} | grep -v 'unknown' | grep -q '{{ item }}' == 1 ]]; then + if ! {{ android_sdkmanager2_list }} | grep -v 'unknown' | grep -q '{{ item }}'; then yes | {{ android_sdkmanager2_install }} '{{ item }}' - if [[ {{ android_sdkmanager2_list }} | grep -q '{{ item }}' == 0 ]]; then + if {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then echo "INSTALLED" else echo "FAILED" @@ -281,10 +281,10 @@ - name: Workstation | Linux | Software | Android | Install | Additional Modules ansible.builtin.shell: | set -o pipefail - if [[ {{ android_sdkmanager2_list }} | grep -v 'unknown' | grep -q '{{ item }}' == 1 ]]; then + if ! {{ android_sdkmanager2_list }} | grep -v 'unknown' | grep -q '{{ item }}'; then yes | {{ android_sdkmanager2_install }} '{{ item }}' - if [[ {{ android_sdkmanager2_list }} | grep -q '{{ item }}' == 0 ]]; then + if {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then echo "INSTALLED" else echo "FAILED" @@ -303,13 +303,13 @@ - name: Workstation | Linux | Software | Android | Uninstall | Additional Modules ansible.builtin.shell: | set -o pipefail - if [[ {{ android_sdkmanager2_list }} | grep -q '{{ item }}' == 0 ]]; then + if {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then yes | {{ android_sdkmanager2_remove }} '{{ item }}' - if [[ {{ android_sdkmanager2_list }} | grep -q '{{ item }}' == 1 ]]; then - echo "REMOVED" - else + if {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then echo "FAILED" + else + echo "REMOVED" fi fi loop: "{{ android_downloads_additional }}" @@ -325,10 +325,10 @@ - name: Workstation | Linux | Software | Android | Uninstall | Unused Modules ansible.builtin.shell: | set -o pipefail - if [[ {{ android_sdkmanager2_list }} | grep -q '{{ item }}' == 0 ]]; then + if [[ `{{ android_sdkmanager2_list }} | grep -q '{{ item }}'` == 0 ]]; then yes | {{ android_sdkmanager2_remove }} '{{ item }}' - if [[ {{ android_sdkmanager2_list }} | grep -q '{{ item }}' == 1 ]]; then + if [[ `{{ android_sdkmanager2_list }} | grep -q '{{ item }}'` == 1 ]]; then echo "REMOVED" else echo "FAILED"