From 8dd1ca355a67884ad722f61c3a68396605fbfc15 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Wed, 21 Oct 2026 00:32:26 +0000
Subject: [PATCH] aur: retry a failed AUR build once; don't abort post-install
 on one app

yay builds dependencies first; when one fails transiently (libpdfium-nojs
hit a broken download in prepare()), yay retries the dependency but drops
the package that needs it (yacreader: "Missing dependencies"). Under
set -e that aborted the whole post-install.

_install_aur now retries once and returns 1 (recording the pkg in
_aur_failed) if both attempts fail. post-install tolerates failures of
its optional AUR apps and lists them at the end; enable-limine-snapshots
still aborts, since it needs its packages.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012pNTgiWNwQg9cE63aUxicE
---
 setup/lib/aur.sh      | 33 ++++++++++++++++++++++++++-------
 setup/post-install.sh | 40 +++++++++++++++++++++++-----------------
 2 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/setup/lib/aur.sh b/setup/lib/aur.sh
index cd69736..7834d0c 100644
--- a/setup/lib/aur.sh
+++ b/setup/lib/aur.sh
@@ -3,11 +3,13 @@
 # Callers must define the color vars: B S F O T R.
 
 _aur_fresh=0
+_aur_failed=()
 
 # Local: install AUR pkg on the current system.
 # Usage: _install_aur <pkg> <label> [<bin>]
 # Pass <bin> to skip when the command already exists.
-# Sets _aur_fresh=1 if newly installed, 0 if skipped.
+# Sets _aur_fresh=1 if newly installed, 0 if skipped. On failure returns 1
+# and appends <pkg> to _aur_failed.
 _install_aur() {
     local pkg="$1" label="$2" bin="${3:-}"
     _aur_fresh=0
@@ -17,19 +19,36 @@ _install_aur() {
         return 0
     fi
     echo -e "  ${F}Installing ${label} (AUR)...${R}"
+    # One retry: when a dependency fails mid-build (e.g. a flaky download in
+    # its prepare()), yay rebuilds the dependency but has already given up
+    # on the package that needs it. A second pass finds the dep installed.
+    if ! _aur_build "$pkg"; then
+        echo -e "  ${S}Retrying ${label}...${R}"
+        if ! _aur_build "$pkg"; then
+            echo -e "  ${T}[!] ${label} install failed — retry later: yay -S ${pkg}${R}"
+            _aur_failed+=("$pkg")
+            return 1
+        fi
+    fi
+    echo -e "  ${O}[✓] ${label} installed.${R}"
+    _aur_fresh=1
+}
+
+_aur_build() {
+    local pkg="$1"
     if command -v yay &>/dev/null; then
         yay -S --needed --noconfirm "$pkg"
     elif command -v paru &>/dev/null; then
         paru -S --needed --noconfirm "$pkg"
     else
-        echo -e "  ${S}Installing ${label} manually via makepkg...${R}"
-        local _tmpdir; _tmpdir=$(mktemp -d)
-        git clone "https://aur.archlinux.org/${pkg}.git" "$_tmpdir/$pkg"
-        (cd "$_tmpdir/$pkg" && makepkg -si --noconfirm)
+        echo -e "  ${S}Installing ${pkg} manually via makepkg...${R}"
+        local _tmpdir _rc; _tmpdir=$(mktemp -d)
+        git clone "https://aur.archlinux.org/${pkg}.git" "$_tmpdir/$pkg" \
+            && (cd "$_tmpdir/$pkg" && makepkg -si --noconfirm)
+        _rc=$?
         rm -rf "$_tmpdir"
+        return $_rc
     fi
-    echo -e "  ${O}[✓] ${label} installed.${R}"
-    _aur_fresh=1
 }
 
 # Chroot variant: install AUR pkg into a target system mounted at $INSTALL_ROOT
diff --git a/setup/post-install.sh b/setup/post-install.sh
index bd543d3..cc4dd72 100755
--- a/setup/post-install.sh
+++ b/setup/post-install.sh
@@ -280,32 +280,32 @@ if [ "$INSTALL_PKGS" = "y" ]; then
     echo -e "  ${O}[✓] Official packages installed.${R}"
 
     # ── AUR packages (common pattern) ──
-    _install_aur brave-bin              "Brave Browser"         brave
-    _install_aur obsidian               "Obsidian"              obsidian
-    _install_aur satty                  "Satty"                 satty
-    _install_aur glslviewer             "glslViewer (GPU shaders)" glslViewer
-    _install_aur eww                    "eww"                   eww
+    _install_aur brave-bin              "Brave Browser"         brave || true
+    _install_aur obsidian               "Obsidian"              obsidian || true
+    _install_aur satty                  "Satty"                 satty || true
+    _install_aur glslviewer             "glslViewer (GPU shaders)" glslViewer || true
+    _install_aur eww                    "eww"                   eww || true
     if [ "$WM_CHOICE" != "niri" ]; then
-        _install_aur hyprswitch         "Hyprswitch (Alt+Tab)"  hyprswitch
+        _install_aur hyprswitch         "Hyprswitch (Alt+Tab)"  hyprswitch || true
     fi
-    _install_aur enpass-bin             "Enpass"                enpass
-    _install_aur yacreader              "YACReader"             YACReader
-    _install_aur onlyoffice-bin         "OnlyOffice"            desktopeditors
-    _install_aur betterbird-bin         "Betterbird"            betterbird
-    _install_aur libinput-gestures      "libinput-gestures"     libinput-gestures
-    _install_aur protonvpn-cli          "ProtonVPN CLI"         protonvpn-cli
+    _install_aur enpass-bin             "Enpass"                enpass || true
+    _install_aur yacreader              "YACReader"             YACReader || true
+    _install_aur onlyoffice-bin         "OnlyOffice"            desktopeditors || true
+    _install_aur betterbird-bin         "Betterbird"            betterbird || true
+    _install_aur libinput-gestures      "libinput-gestures"     libinput-gestures || true
+    _install_aur protonvpn-cli          "ProtonVPN CLI"         protonvpn-cli || true
     if [ "$_aur_fresh" = 1 ]; then
         echo -e "  ${S}    To login: protonvpn-cli login <username>${R}"
         echo -e "  ${S}    Or use: Super+S → VPN${R}"
     fi
-    _install_aur bauh                   "Bauh (package manager GUI)" bauh
-    _install_aur nwg-look               "nwg-look (GTK theme editor)" nwg-look
+    _install_aur bauh                   "Bauh (package manager GUI)" bauh || true
+    _install_aur nwg-look               "nwg-look (GTK theme editor)" nwg-look || true
 
     # ── AUR packages with custom already-installed checks ──
 
     # EB Garamond — font, no binary to probe
     if ! fc-list | grep -qi "EB Garamond" 2>/dev/null; then
-        _install_aur otf-eb-garamond "EB Garamond font"
+        _install_aur otf-eb-garamond "EB Garamond font" || true
     else
         echo ""
         echo -e "  ${S}[~] EB Garamond already installed.${R}"
@@ -313,18 +313,24 @@ if [ "$INSTALL_PKGS" = "y" ]; then
 
     # Colloid icons + cursors — identified by directory presence
     if [ ! -d /usr/share/icons/Colloid-dark ] && [ ! -d "$HOME/.local/share/icons/Colloid-dark" ]; then
-        _install_aur colloid-icon-theme-git "Colloid icon theme"
+        _install_aur colloid-icon-theme-git "Colloid icon theme" || true
     else
         echo ""
         echo -e "  ${S}[~] Colloid icons already installed.${R}"
     fi
     if [ ! -d /usr/share/icons/Colloid-cursors ] && [ ! -d "$HOME/.local/share/icons/Colloid-cursors" ]; then
-        _install_aur colloid-cursors-git "Colloid cursors"
+        _install_aur colloid-cursors-git "Colloid cursors" || true
     else
         echo ""
         echo -e "  ${S}[~] Colloid cursors already installed.${R}"
     fi
 
+    if [ ${#_aur_failed[@]} -gt 0 ]; then
+        echo ""
+        echo -e "  ${T}[!] Some AUR packages failed: ${_aur_failed[*]}${R}"
+        echo -e "  ${S}    Retry later: yay -S ${_aur_failed[*]}${R}"
+    fi
+
     # ── Div Acer Manager Max (DAMX) — only on Acer hardware ──
     # DFM is installed by install.sh from the in-tree fork; no separate step needed here.
     echo ""