Compare commits

...
6 Commits
Author SHA1 Message Date
me f7a260c722 setup, continue working on log output. 2026-09-29 15:52:59 -07:00
me 65d0c3c45e android, use proper if statements. 2026-09-29 15:52:38 -07:00
me e094ec7143 android, fix churn caused by flutter. 2026-09-29 15:52:19 -07:00
me 772c2906dd setup, make the output a bit more consistent. 2026-09-29 14:34:38 -07:00
me eb54844618 android, add comments to versions. 2026-09-29 14:34:16 -07:00
me f8226c07c3 android, fix grep quotes. 2026-09-29 14:34:01 -07:00
2 changed files with 24 additions and 22 deletions

No files matched your search

+10 -7
View File
@@ -78,6 +78,7 @@ if [[ "$branch" == "" ]]; then
else else
echo "Set branch to '$branch'." echo "Set branch to '$branch'."
fi fi
echo " "
fi fi
if [[ -n "$create_general" && -f "$general_config" ]]; then if [[ -n "$create_general" && -f "$general_config" ]]; then
@@ -130,7 +131,7 @@ if [[ `which ansible > /dev/null; echo $?` != 0 ]]; then
exit 1 exit 1
fi fi
fi fi
echo "- Installed!" echo -e "- Installed!\n"
if [[ -n $HOSTS_DIR && -n $HOSTS_FILE ]]; then if [[ -n $HOSTS_DIR && -n $HOSTS_FILE ]]; then
echo "Ensuring hosts file exists..." echo "Ensuring hosts file exists..."
@@ -139,7 +140,7 @@ if [[ -n $HOSTS_DIR && -n $HOSTS_FILE ]]; then
sudo sh -c "echo 'localhost ansible_connection=local' > $HOSTS_FILE" sudo sh -c "echo 'localhost ansible_connection=local' > $HOSTS_FILE"
fi fi
echo "$HOSTS_FILE: '`cat $HOSTS_FILE`'" echo "$HOSTS_FILE: '`cat $HOSTS_FILE`'"
echo "- Hosts file created successfully!" echo -e "- Hosts file created successfully!\n"
fi fi
if [[ "$show_facts" == "Y" ]]; then if [[ "$show_facts" == "Y" ]]; then
@@ -207,20 +208,22 @@ if [[ -n "$create_server" && ! -f "$server_config" ]]; then
print_server_contents | sudo tee "$server_config" print_server_contents | sudo tee "$server_config"
ls -lh "$server_config" ls -lh "$server_config"
fi fi
echo " "
echo "Verifying this is the only run..." echo "Verifying this is the only run..."
ps -ef | grep ansible-playbook | grep -v grep ps -ef | grep ansible-playbook | grep -v grep
ansible_exists="$?" ansible_exists="$?"
lock_file=/tmp/ansible-playbook.lock lock_file=/tmp/ansible-playbook.lock
if [[ "$ansible_exists" == 0 ]]; then if [[ "$ansible_exists" == 0 ]]; then
echo "Playbook is already being executed. Exiting." echo "- Playbook is already being executed. Exiting."
exit 0 exit 0
elif [[ -e "$lock_file" ]]; then elif [[ -e "$lock_file" ]]; then
echo "Playbook not being executed. Removing lock file." echo "- Removing lock file."
sudo mv -v "$lock_file" "${lock_file}.disabled" sudo mv -v "$lock_file" "${lock_file}.disabled"
else else
echo "- No processes or lockfile found." echo "- No processes or lockfile found."
fi fi
echo " "
echo "Provisioning Ansible..." echo "Provisioning Ansible..."
if [[ "$local" == "Y" ]]; then if [[ "$local" == "Y" ]]; then
@@ -228,13 +231,13 @@ if [[ "$local" == "Y" ]]; then
else else
sudo ansible-pull -U $URL.git --checkout $branch sudo ansible-pull -U $URL.git --checkout $branch
fi fi
echo "- Provisioned!" echo -e "- Provisioned!\n"
echo "Mounting all drives..." echo "Mounting all drives..."
mount -a mount -a
echo "- Mounted!" echo -e "- Mounted!\n"
echo "Don't forget to set any new users' passwords!" echo -e "Don't forget to set any new users' passwords!\n"
## Finish ## ## Finish ##
+14 -15
View File
@@ -81,19 +81,19 @@
- name: Workstation | Linux | Software | Android | Facts [Downloads] - name: Workstation | Linux | Software | Android | Facts [Downloads]
set_fact: set_fact:
android_downloads_required: android_downloads_required:
### 36 ### ### 36 ### - Recommended by Android Studio and Flutter, deprecated August 2027.
# Flutter still uses 36.0.0
- build-tools/36.0.0 - build-tools/36.0.0
# Stick with 36, 37 not yet ready according to Android Studio
- platforms/android-36 - platforms/android-36
- sources/android-36 - sources/android-36
- system-images/android-36/default/x86_64 - system-images/android-36/default/x86_64
### 24 ### ### 35 ### - Still used by Flutter to do compilations, even targeting 36, likely due to plugins.
- platforms/android-35
### 24 ### - Base for Flutter.
- system-images/android-24/default/x86_64 - system-images/android-24/default/x86_64
### 16 ### ### 16 ### - Base for Android Studio.
- system-images/android-16/default/x86 - system-images/android-16/default/x86
android_downloads_additional: android_downloads_additional:
### 37 ### ### 37 ### - Upcoming version, required by August 2027.
- build-tools/37.0.0 - build-tools/37.0.0
- platforms/android-37.0 - platforms/android-37.0
- sources/android-37.0 - sources/android-37.0
@@ -107,7 +107,6 @@
### 35 ### ### 35 ###
- build-tools/35.0.0 - build-tools/35.0.0
- build-tools/35.0.1 - build-tools/35.0.1
- platforms/android-35
- sources/android-35 - sources/android-35
- system-images/android-35/default/x86_64 - system-images/android-35/default/x86_64
- system-images/android-35/aosp_atd/x86_64 # ATD = Automated Test Device - system-images/android-35/aosp_atd/x86_64 # ATD = Automated Test Device
@@ -255,10 +254,10 @@
# These are safe to run multiple times, and uses the new `latest` version. # These are safe to run multiple times, and uses the new `latest` version.
- name: Workstation | Linux | Software | Android | Install | Required Modules - name: Workstation | Linux | Software | Android | Install | Required Modules
shell: | shell: |
if ! {{ android_sdkmanager2_list }} | grep -q '{{ item }} | grep -v unknown'; then if [[ {{ android_sdkmanager2_list }} | grep -v 'unknown' | grep -q '{{ item }}' == 1 ]]; then
yes | {{ android_sdkmanager2_install }} '{{ item }}' yes | {{ android_sdkmanager2_install }} '{{ item }}'
if {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then if [[ {{ android_sdkmanager2_list }} | grep -q '{{ item }}' == 0 ]]; then
echo "INSTALLED" echo "INSTALLED"
else else
echo "FAILED" echo "FAILED"
@@ -274,10 +273,10 @@
# Add more versions for testing across all the important platforms. # Add more versions for testing across all the important platforms.
- name: Workstation | Linux | Software | Android | Install | Additional Modules - name: Workstation | Linux | Software | Android | Install | Additional Modules
shell: | shell: |
if ! {{ android_sdkmanager2_list }} | grep -q '{{ item }} | grep -v unknown'; then if [[ {{ android_sdkmanager2_list }} | grep -v 'unknown' | grep -q '{{ item }}' == 1 ]]; then
yes | {{ android_sdkmanager2_install }} '{{ item }}' yes | {{ android_sdkmanager2_install }} '{{ item }}'
if {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then if [[ {{ android_sdkmanager2_list }} | grep -q '{{ item }}' == 0 ]]; then
echo "INSTALLED" echo "INSTALLED"
else else
echo "FAILED" echo "FAILED"
@@ -294,10 +293,10 @@
# 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: | shell: |
if {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then if [[ {{ android_sdkmanager2_list }} | grep -q '{{ item }}' == 0 ]]; then
yes | {{ android_sdkmanager2_remove }} '{{ item }}' yes | {{ android_sdkmanager2_remove }} '{{ item }}'
if ! {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then if [[ {{ android_sdkmanager2_list }} | grep -q '{{ item }}' == 1 ]]; then
echo "REMOVED" echo "REMOVED"
else else
echo "FAILED" echo "FAILED"
@@ -314,10 +313,10 @@
# 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: | shell: |
if {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then if [[ {{ android_sdkmanager2_list }} | grep -q '{{ item }}' == 0 ]]; then
yes | {{ android_sdkmanager2_remove }} '{{ item }}' yes | {{ android_sdkmanager2_remove }} '{{ item }}'
if ! {{ android_sdkmanager2_list }} | grep -q '{{ item }}'; then if [[ {{ android_sdkmanager2_list }} | grep -q '{{ item }}' == 1 ]]; then
echo "REMOVED" echo "REMOVED"
else else
echo "FAILED" echo "FAILED"