From 339932d83c62dbf815f733e5fd88e5b093eef168 Mon Sep 17 00:00:00 2001
From: superrob1500 <services@robsrepacks.com>
Date: Sun, 12 Oct 2025 21:41:19 +0200
Subject: [PATCH] libadwaita-dev fix on ubuntu/debian - clean apt-get

---
 ghostty-build-update.sh | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/ghostty-build-update.sh b/ghostty-build-update.sh
index 279c707..d821887 100644
--- a/ghostty-build-update.sh
+++ b/ghostty-build-update.sh
@@ -142,28 +142,40 @@ install_deps_linux() {
   fi
 
   if command_exists apt-get; then
-    info "Installing dependencies via apt-get..."
-    sudo apt-get update
+    info "Installing dependencies via apt..."
+    sudo apt update
 
     # Base packages
-    sudo apt-get install -y git libgtk-4-dev gettext libxml2-utils pkg-config curl tar xz-utils g++
+    sudo apt install -y git libgtk-4-dev gettext libxml2-utils pkg-config curl tar xz-utils g++
 
-    # Harfbuzz dev libraries
-    sudo apt-get install -y libharfbuzz-dev libharfbuzz-gobject0
+    # Harfbuzz development
+    sudo apt install -y libharfbuzz-dev libharfbuzz-gobject0
 
     # GTK Blueprint compiler
-    sudo apt-get install -y blueprint-compiler
+    sudo apt install -y blueprint-compiler
 
     # libadwaita and gtk-layer-shell packages
     case "$distro" in
-      ubuntu)
-        sudo apt-get install -y libadwaita-1-dev libgtk-layer-shell-dev
-        ;;
-      debian)
-        sudo apt-get install -y libadwaita-dev libgtk4-layer-shell-dev
+      ubuntu|debian)
+        # Try -1-dev first, fallback to -dev
+        if ! sudo apt install -y libadwaita-1-dev; then
+          sudo apt install -y libadwaita-dev || true
+        fi
         ;;
       *)
-        sudo apt-get install -y libadwaita-dev libadwaita-1-dev libgtk4-layer-shell-dev libgtk-layer-shell-dev || true
+        sudo apt install -y libadwaita-1-dev libadwaita-dev || true
+        ;;
+    esac
+
+    case "$distro" in
+      ubuntu)
+        sudo apt install -y libgtk-layer-shell-dev || true
+        ;;
+      debian)
+        sudo apt install -y libgtk4-layer-shell-dev || true
+        ;;
+      *)
+        sudo apt install -y libgtk4-layer-shell-dev libgtk-layer-shell-dev || true
         ;;
     esac