From c4ad5a94719481346d9dab8fdb5b2ed29f9b49b5 Mon Sep 17 00:00:00 2001
From: Jeevitha Kannan K S <ksjeevithakannan123@gmail.com>
Date: Mon, 11 Nov 2024 21:52:53 +0530
Subject: [PATCH] fix: headers not installing (#915)

---
 .../tabs/applications-setup/waydroid-setup.sh | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/core/tabs/applications-setup/waydroid-setup.sh b/core/tabs/applications-setup/waydroid-setup.sh
index 8cac399f..0d305e65 100755
--- a/core/tabs/applications-setup/waydroid-setup.sh
+++ b/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
@@ -11,28 +11,31 @@ checkGpu() {
 
 installWaydroid() {
     if ! command_exists waydroid; then
-    printf "%b\n" "${YELLOW}Installing Waydroid...${RC}"
+        printf "%b\n" "${YELLOW}Installing Waydroid...${RC}"
         case "$PACKAGER" in
             pacman)
                 "$AUR_HELPER" -S --needed --noconfirm waydroid
+
                 if ! command_exists dkms; then
-                    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
+
+                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
+
                 "$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/