fix(atomic-guard): graceful degradation when common.sh fails to load

Author: linux_name2

bin/atomic-guard

@@ -8,7 +8,15 @@
 # checks and process-tree walking that would break with errexit.
 
 readonly LIBDIR="/usr/lib/atomic"
-_p=$(verify-lib "${LIBDIR}/common.sh" "$LIBDIR/" 2>/dev/null) && source "$_p"
+
+# Load common.sh with graceful degradation
+_COMMON_LOADED=0
+if _p=$(verify-lib "${LIBDIR}/common.sh" "$LIBDIR/" 2>/dev/null) && [[ -n "$_p" ]]; then
+    if source "$_p" 2>/dev/null; then
+        _COMMON_LOADED=1
+    fi
+fi
+
 LOCK_FILE="${LOCK_FILE:-/var/lock/atomic-upgrade.lock}"
 
 # If guard is disabled in config, allow everything
@@ -25,9 +33,6 @@ if [[ "${ATOMIC_UPGRADE:-}" == "1" ]]; then
 fi
 
 # ── Sysupgrade detection ────────────────────────────────────────
-# Only block full system upgrades (-Su / -Syu / --sync --sysupgrade).
-# Walk up the process tree to find the pacman process, then inspect
-# its cmdline arguments.
 is_sysupgrade() {
     local pid=$$
     while [[ $pid -ne 1 ]]; do
@@ -48,7 +53,6 @@ is_sysupgrade() {
         fi
         pid=$(awk '/^PPid:/{print $2}' "/proc/$pid/status" 2>/dev/null) || break
     done
-    # Cannot find pacman in process tree — block for safety
     echo "atomic-guard: pacman not found in process tree, blocking" >&2
     return 0
 }
@@ -58,11 +62,31 @@ if ! is_sysupgrade; then
 fi
 
 # Allow AUR helpers — walk up the process tree via /proc
-
-if type -t is_child_of_aur_helper &>/dev/null && is_child_of_aur_helper; then
-    echo -e "\033[33mNOTE: AUR helper sysupgrade runs on live system (not atomic)\033[0m" >&2
-    echo -e "\033[33m      For atomic upgrades use: sudo atomic-upgrade\033[0m" >&2
-    exit 0
+if [[ $_COMMON_LOADED -eq 1 ]]; then
+    if type -t is_child_of_aur_helper &>/dev/null && is_child_of_aur_helper; then
+        echo -e "\033[33mNOTE: AUR helper sysupgrade runs on live system (not atomic)\033[0m" >&2
+        echo -e "\033[33m      For atomic upgrades use: sudo atomic-upgrade\033[0m" >&2
+        exit 0
+    fi
+else
+    # Fallback: inline AUR helper check when common.sh failed to load
+    _check_aur_helper() {
+        local pid=$$
+        while [[ $pid -ne 1 ]]; do
+            local comm
+            comm=$(cat "/proc/$pid/comm" 2>/dev/null) || break
+            case "$comm" in
+                yay|paru|pikaur|aura) return 0 ;;
+            esac
+            pid=$(awk '/^PPid:/{print $2}' "/proc/$pid/status" 2>/dev/null) || break
+        done
+        return 1
+    }
+    if _check_aur_helper; then
+        echo -e "\033[33mNOTE: AUR helper sysupgrade runs on live system (not atomic)\033[0m" >&2
+        echo -e "\033[33m      For atomic upgrades use: sudo atomic-upgrade\033[0m" >&2
+        exit 0
+    fi
 fi
 
 cat << 'EOF'