From 889f3818fc2ecd212b13b830c5fdbeb05f42a0d3 Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Mon, 25 Aug 2025 17:03:17 +0200
Subject: [PATCH] Update based on package version from info

---
 build/build-aur.sh | 257 +++++++++++++++++++++++----------------------
 1 file changed, 131 insertions(+), 126 deletions(-)

diff --git a/build/build-aur.sh b/build/build-aur.sh
index 8b435c6..445f2d0 100644
--- a/build/build-aur.sh
+++ b/build/build-aur.sh
@@ -1,136 +1,141 @@
 #!/bin/bash
 # AUR package building functions
 
+# Get version from local repo database
+get_local_version() {
+  local pkg="$1"
+  if [[ -f /output/omarchy.db.tar.zst ]]; then
+    # First find the exact desc file for this package (not package-debug, etc)
+    # Pattern matches: package-version/desc where version starts with a number
+    local desc_file=$(tar -tf /output/omarchy.db.tar.zst | grep "^${pkg}-[0-9].*/desc$" | head -1)
+
+    if [[ -n "$desc_file" ]]; then
+      # Extract that specific file and get the version
+      tar -xOf /output/omarchy.db.tar.zst "$desc_file" 2>/dev/null |
+        awk '/%VERSION%/{getline; print; exit}'
+    fi
+  fi
+}
+
 # Simple function to build an AUR package
 build_aur_package() {
-    local pkg="$1"
-    local opts="$2"
-    
-    echo "  -> Building $pkg..."
-    cd /src
-    
-    # Case 1: Directory exists with PKGBUILD - check for updates
-    if [[ -d "$pkg" ]] && [[ -f "$pkg/PKGBUILD" ]]; then
-        cd "$pkg"
-        
-        # Store current commit before pull
-        OLD_COMMIT=$(git rev-parse HEAD 2>/dev/null || echo "none")
-        
-        # Try to pull updates
-        git pull --quiet
-        
-        # Get new commit after pull
-        NEW_COMMIT=$(git rev-parse HEAD 2>/dev/null || echo "none")
-        
-        # Determine if we need to build
-        if [[ "$FORCE_REBUILD" == "true" ]]; then
-            echo "    Forcing rebuild..."
-        elif [[ "$OLD_COMMIT" != "$NEW_COMMIT" ]]; then
-            echo "    Updates found, rebuilding..."
-        else
-            echo "    No updates found, skipping"
-            return 0
-        fi
-    
-    # Case 2: Directory exists but no PKGBUILD - reclone
-    elif [[ -d "$pkg" ]]; then
-        echo "    Incomplete clone detected, removing and recloning..."
-        rm -rf "$pkg"
-        git clone "https://aur.archlinux.org/${pkg}.git" || {
-            echo "    Failed to clone $pkg"
-            FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
-            return 1
-        }
-        cd "$pkg"
-    
-    # Case 3: Directory doesn't exist - clone
-    else
-        # Get the package base from AUR RPC (some packages have different repo names)
-        local pkg_base=$(curl -s "https://aur.archlinux.org/rpc/?v=5&type=info&arg[]=$pkg" | jq -r '.results[0].PackageBase // empty')
-        
-        # Fall back to package name if API call fails or returns nothing
-        if [[ -z "$pkg_base" ]]; then
-            pkg_base="$pkg"
-        elif [[ "$pkg_base" != "$pkg" ]]; then
-            echo "    Using package base: $pkg_base"
-        fi
-        
-        git clone "https://aur.archlinux.org/${pkg_base}.git" "$pkg" || {
-            echo "    Failed to clone $pkg"
-            FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
-            return 1
-        }
-        cd "$pkg"
+  local pkg="$1"
+  local opts="$2"
+
+  echo "  -> Processing $pkg..."
+
+  # Get version from AUR API (also gets package base)
+  local aur_info=$(curl -s "https://aur.archlinux.org/rpc/?v=5&type=info&arg[]=$pkg")
+  local aur_version=$(echo "$aur_info" | jq -r '.results[0].Version // empty')
+  local pkg_base=$(echo "$aur_info" | jq -r '.results[0].PackageBase // empty')
+
+  if [[ -z "$aur_version" ]]; then
+    echo "    Package not found in AUR"
+    FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
+    return 1
+  fi
+
+  # Use package name as base if not specified
+  if [[ -z "$pkg_base" ]]; then
+    pkg_base="$pkg"
+  elif [[ "$pkg_base" != "$pkg" ]]; then
+    echo "    Using package base: $pkg_base"
+  fi
+
+  # Check if we need to build
+  local local_version=$(get_local_version "$pkg")
+
+  if [[ "$FORCE_REBUILD" == "true" ]]; then
+    echo "    Forcing rebuild (AUR: $aur_version)"
+  elif [[ "$local_version" == "$aur_version" ]]; then
+    echo "    Up to date: $local_version - Skipping build"
+    return 0
+  elif [[ -n "$local_version" ]]; then
+    echo "    Update available: $local_version -> $aur_version"
+  else
+    echo "    Not built yet (AUR: $aur_version)"
+  fi
+
+  # Always fresh clone when building
+  cd /src
+  rm -rf "$pkg"
+
+  git clone "https://aur.archlinux.org/${pkg_base}.git" "$pkg" || {
+    echo "    Failed to clone $pkg_base"
+    FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
+    return 1
+  }
+
+  cd "$pkg"
+
+  # Build package
+  MAKEPKG_FLAGS="-sc --noconfirm"
+
+  # Check for skip-pgp in options or global SKIP_PGP
+  if [[ "$SKIP_PGP" == "true" ]] || [[ "$opts" == *"skip-pgp"* ]]; then
+    MAKEPKG_FLAGS="$MAKEPKG_FLAGS --skippgpcheck"
+    echo "    (skipping PGP verification)"
+  fi
+
+  if gpg --list-secret-keys 2>/dev/null | grep -q "sec"; then
+    makepkg $MAKEPKG_FLAGS --sign || {
+      echo "    Failed to build $pkg"
+      FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
+      cd /src
+      return 1
+    }
+  else
+    makepkg $MAKEPKG_FLAGS || {
+      echo "    Failed to build $pkg"
+      FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
+      cd /src
+      return 1
+    }
+  fi
+
+  # Copy to output and add to temporary build repo
+  for pkg_file in *.pkg.tar.*; do
+    if [[ -f "$pkg_file" ]] && [[ "$pkg_file" != *.sig ]]; then
+      cp "$pkg_file" /output/
+      # Add to temporary repo database (pointing to /output files)
+      repo-add /tmp/build-repo/omarchy-build.db.tar.gz "/output/$pkg_file"
     fi
-    
-    # Build package
-    MAKEPKG_FLAGS="-sc --noconfirm"
-    
-    # Check for skip-pgp in options or global SKIP_PGP
-    if [[ "$SKIP_PGP" == "true" ]] || [[ "$opts" == *"skip-pgp"* ]]; then
-        MAKEPKG_FLAGS="$MAKEPKG_FLAGS --skippgpcheck"
-        echo "    (skipping PGP verification)"
-    fi
-    
-    if gpg --list-secret-keys 2>/dev/null | grep -q "sec"; then
-        makepkg $MAKEPKG_FLAGS --sign || {
-            echo "    Failed to build $pkg"
-            FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
-            cd /src
-            return 1
-        }
-    else
-        makepkg $MAKEPKG_FLAGS || {
-            echo "    Failed to build $pkg"
-            FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
-            cd /src
-            return 1
-        }
-    fi
-    
-    # Copy to output and add to temporary build repo
-    for pkg_file in *.pkg.tar.*; do
-        if [[ -f "$pkg_file" ]] && [[ "$pkg_file" != *.sig ]]; then
-            cp "$pkg_file" /output/
-            # Add to temporary repo database (pointing to /output files)
-            repo-add /tmp/build-repo/omarchy-build.db.tar.gz "/output/$pkg_file"
-        fi
-    done
-    
-    # Update pacman database to see new packages
-    sudo pacman -Sy
-    
-    echo "    Successfully built $pkg"
-    cd /src
+  done
+
+  # Update pacman database to see new packages
+  sudo pacman -Sy
+
+  echo "    Successfully built $pkg"
+  cd /src
 }
 
 build_aur_packages() {
-    # Work in the mounted src directory
-    cd /src
-    
-    FAILED_PACKAGES=""
-    
-    if [[ -s /tmp/packages.aur ]]; then
-        echo "==> Building AUR packages..."
-        while IFS= read -r line || [ -n "$line" ]; do
-            [[ "$line" =~ ^#.*$ ]] && continue
-            [[ -z "$line" ]] && continue
-            
-            # Parse package name and options
-            package=$(echo "$line" | awk '{print $1}')
-            options=$(echo "$line" | awk '{$1=""; print $0}' | xargs)
-            
-            # Build the package
-            build_aur_package "$package" "$options"
-        done < /tmp/packages.aur
-        
-        # Report failures at the end
-        if [[ -n "$FAILED_PACKAGES" ]]; then
-            echo ""
-            echo "==> Failed packages:"
-            for pkg in $FAILED_PACKAGES; do
-                echo "  - $pkg"
-            done
-        fi
+  # Work in the mounted src directory
+  cd /src
+
+  FAILED_PACKAGES=""
+
+  if [[ -s /tmp/packages.aur ]]; then
+    echo "==> Building AUR packages..."
+    while IFS= read -r line || [ -n "$line" ]; do
+      [[ "$line" =~ ^#.*$ ]] && continue
+      [[ -z "$line" ]] && continue
+
+      # Parse package name and options
+      package=$(echo "$line" | awk '{print $1}')
+      options=$(echo "$line" | awk '{$1=""; print $0}' | xargs)
+
+      # Build the package
+      build_aur_package "$package" "$options"
+    done </tmp/packages.aur
+
+    # Report failures at the end
+    if [[ -n "$FAILED_PACKAGES" ]]; then
+      echo ""
+      echo "==> Failed packages:"
+      for pkg in $FAILED_PACKAGES; do
+        echo "  - $pkg"
+      done
     fi
-}
\ No newline at end of file
+  fi
+}