From b653191de228fe50d39000e0fd05c0d7acd04251 Mon Sep 17 00:00:00 2001 From: mk Date: Tue, 28 Jul 2026 05:53:43 +0300 Subject: [PATCH] angie(arch): prefer angie-bin (repackaged upstream .deb, instant) over source build; verified http_acme/ssl/v2/v3/realip all compiled in; fall back to aur/angie if bin unavailable --- modules/25-angie.sh | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/modules/25-angie.sh b/modules/25-angie.sh index 03e7e2c..314e19c 100755 --- a/modules/25-angie.sh +++ b/modules/25-angie.sh @@ -27,12 +27,25 @@ run_angie() { } _angie_arch() { - if command -v yay >/dev/null 2>&1; then - as_user yay -S --noconfirm angie 2>/dev/null \ - || as_user yay -S --noconfirm aur/angie 2>/dev/null \ - || warn "angie AUR build failed — try: yay -S angie" + if ! command -v yay >/dev/null 2>&1; then + warn "yay not available — install angie manually from AUR: yay -S angie-bin" + return + fi + # Prefer angie-bin: it repackages the upstream official Ubuntu .deb, so it's + # instant (no source compile) and carries the same compiled-in modules our + # config relies on — http_acme, http_ssl, http_v2/v3, http_realip, stream* + # (verified via the .deb's 'angie -V'). Drop back to the source 'angie' + # package only if the binary package is unavailable. + log "AUR install: angie-bin first, fall back to angie (source build)" + if as_user yay -S --noconfirm --needed angie-bin 2>/dev/null; then + ok "angie-bin installed from AUR" + return + fi + log "angie-bin unavailable/failed — building angie from source (may take a few minutes)" + if as_user yay -S --noconfirm --needed aur/angie 2>/dev/null; then + ok "angie (source) installed from AUR" else - warn "yay not available — install angie manually from AUR: yay -S angie" + warn "angie install failed — try manually: yay -S angie-bin (or: yay -S angie)" fi }