From 423faa4a3a8d82c810c26e58d0b5bed1f1849695 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Tue, 27 Feb 2024 19:09:38 +0100
Subject: [PATCH] chore(just): Combine waydroid recipes

---
 .../ublue-os/just/82-bazzite-waydroid.just    | 51 +++++++++++++------
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-waydroid.just b/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-waydroid.just
index ad1bd559..6b7de41a 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-waydroid.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/82-bazzite-waydroid.just
@@ -1,21 +1,40 @@
 # vim: set ft=make :
 
-# Remove all waydroid-related files in your user folders
-reset-waydroid:
-    bash -c 'sudo rm -rf /var/lib/waydroid /home/.waydroid ~/waydroid ~/.share/waydroid ~/.local/share/applications/*aydroid* ~/.local/share/waydroid'
-
-# Quickly initialize a waydroid image
-init-waydroid:
-    #!/usr/bin/bash
-    sudo waydroid init -c 'https://ota.waydro.id/system' -v 'https://ota.waydro.id/vendor'
+alias configure-waydroid := setup-waydroid
 
 # Launch Waydroid configuration helper
-configure-waydroid:
+setup-waydroid ACTION="":
     #!/usr/bin/bash
-    git clone https://github.com/ublue-os/waydroid_script.git --depth 1 /tmp/waydroid_script
-    python -m venv /tmp/waydroid_script/venv
-    source /tmp/waydroid_script/venv/bin/activate
-    sudo pip install -r /tmp/waydroid_script/requirements.txt
-    sudo /tmp/waydroid_script/main.py
-    deactivate
-    sudo rm -rf /tmp/waydroid_script
+    source /usr/lib/ujust/ujust.sh
+    OPTION={{ ACTION }}
+    if [ "$OPTION" == "help" ]; then
+      echo "Usage: ujust configure-waydroid <option>"
+      echo "  <option>: Specify the quick option to skip the prompt"
+      echo "  Use 'init' to select Initialize Waydroid"
+      echo "  Use 'configure' to select Configure Waydroid"
+      echo "  Use 'gpu' to choose Select GPU for Waydroid"
+      echo "  Use 'reset' to select Configure Waydroid"
+      exit 0
+    elif [ "$OPTION" == "" ]; then
+      echo "${bold}Waydroid Setup${normal}"
+      echo "Please read the $(Urllink "https://universal-blue.discourse.group/docs?topic=32" "Waydroid setup documentation") before continuing"
+      OPTION=$(Choose "Initialize Waydroid" "Configure Waydroid" "Select GPU for Waydroid" "Reset Waydroid (also removes waydroid-related files from user folder)")
+    fi
+    if [[ "${OPTION,,}" =~ ^init ]]; then
+      sudo waydroid init -c 'https://ota.waydro.id/system' -v 'https://ota.waydro.id/vendor'
+      echo "Waydroid has been initialized, please run waydroid once before you Configure Waydroid"
+    elif [[ "${OPTION,,}" =~ ^configure ]]; then
+      git clone https://github.com/ublue-os/waydroid_script.git --depth 1 /tmp/waydroid_script
+      python -m venv /tmp/waydroid_script/venv
+      source /tmp/waydroid_script/venv/bin/activate
+      sudo pip install -r /tmp/waydroid_script/requirements.txt
+      sudo /tmp/waydroid_script/main.py
+      deactivate
+      sudo rm -rf /tmp/waydroid_script
+    elif [[ "${OPTION,,}" =~ gpu ]]; then
+      /usr/bin/waydroid-choose-gpu
+    elif [[ "${OPTION,,}" =~ ^reset ]]; then
+      echo "Resetting Waydroid"
+      bash -c 'sudo rm -rf /var/lib/waydroid /home/.waydroid ~/waydroid ~/.share/waydroid ~/.local/share/applications/*aydroid* ~/.local/share/waydroid'
+      echo "Waydroid has been reset"
+    fi