Merge 200a449243 into 8639da3855

core/tabs/applications-setup/waydroid-setup.sh

@@ -3,7 +3,7 @@
 . ../common-script.sh
 
 checkGpu() {
-    if lspci | grep -i nvidia > /dev/null; then
+    if lspci | grep -i nvidia >/dev/null; then
         printf "%b\n" "${RED}Waydroid is not compatible with NVIDIA GPUs.${RC}"
         exit 1
     fi
@@ -15,24 +15,27 @@ installWaydroid() {
         case "$PACKAGER" in
             pacman)
                 "$AUR_HELPER" -S --needed --noconfirm waydroid
+
                 if ! command_exists dkms; then
+                    "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm dkms
+                fi
+
                 installed_kernels=$("$PACKAGER" -Q | grep -E '^linux(| |-rt|-rt-lts|-hardened|-zen|-lts)[^-headers]' | cut -d ' ' -f 1)
                 for kernel in $installed_kernels; do
                     header="${kernel}-headers"
                     printf "%b\n" "${CYAN}Installing headers for $kernel...${RC}"
                     "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm "$header"
                 done
-                    "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm dkms
-                fi
+
                 "$AUR_HELPER" -S --needed --noconfirm binder_linux-dkms
                 "$ESCALATION_TOOL" modprobe binder-linux device=binder,hwbinder,vndbinder
                 ;;
-            apt-get|nala)
+            apt-get | nala)
                 curl https://repo.waydro.id | "$ESCALATION_TOOL" sh
                 "$ESCALATION_TOOL" "$PACKAGER" install -y waydroid
                 if command_exists dkms; then
                     "$ESCALATION_TOOL" "$PACKAGER" install -y git
-                    mkdir -p "$HOME/.local/share/" # only create it if it doesnt exist
+                    mkdir -p "$HOME/.local/share/"
                     git clone https://github.com/choff/anbox-modules.git "$HOME/.local/share/anbox-modules"
                     cd "$HOME/.local/share/anbox-modules"
                     "$ESCALATION_TOOL" cp anbox.conf /etc/modules-load.d/
@@ -47,7 +50,7 @@ installWaydroid() {
                 "$ESCALATION_TOOL" "$PACKAGER" install -y waydroid
                 if command_exists dkms; then
                     "$ESCALATION_TOOL" "$PACKAGER" install -y git
-                    mkdir -p "$HOME/.local/share/" # only create it if it doesnt exist
+                    mkdir -p "$HOME/.local/share/"
                     git clone https://github.com/choff/anbox-modules.git "$HOME/.local/share/anbox-modules"
                     cd "$HOME/.local/share/anbox-modules"
                     "$ESCALATION_TOOL" cp anbox.conf /etc/modules-load.d/