fix: move paru repo config into moonarch.install to break bootstrap loop
Update PKGBUILD version / update-pkgver (push) Successful in 3s
Update PKGBUILD version / update-pkgver (push) Successful in 3s
The paru PKGBUILD repo config was only set up by post-install.sh and transform.sh. If the config was missing on an existing system, moonarch-git couldn't update — the fix required the package that delivers the fix. Now moonarch.install sets up the config on every install/upgrade. post-install.sh keeps it for first-time bootstrap (before moonarch-git exists). transform.sh no longer manages it.
This commit is contained in:
@@ -60,7 +60,7 @@ fi
|
||||
rm -f "$KEY_FILE"
|
||||
trap - EXIT
|
||||
|
||||
# --- Set up Moonarch custom paru repo ---
|
||||
# --- Set up Moonarch custom paru repo (needed for first install bootstrap) ---
|
||||
|
||||
log "Setting up Moonarch paru repo..."
|
||||
PARU_CONF="/etc/paru.conf"
|
||||
@@ -80,7 +80,7 @@ fi
|
||||
|
||||
paru -Syu --pkgbuilds --noconfirm
|
||||
|
||||
# --- Install moonarch-git (pulls in all configs, scripts, themes as dependencies) ---
|
||||
# --- Install moonarch-git (subsequent updates handled by moonarch.install hook) ---
|
||||
|
||||
log "Installing moonarch-git package..."
|
||||
paru -S --needed --noconfirm moonarch-git
|
||||
|
||||
+1
-11
@@ -245,17 +245,7 @@ fi
|
||||
rm -f "$KEY_FILE"
|
||||
trap - EXIT
|
||||
|
||||
# Moonarch custom paru repo
|
||||
log "Setting up Moonarch paru repo..."
|
||||
PARU_CONF="/etc/paru.conf"
|
||||
if ! grep -q '\[moonarch-pkgbuilds\]' "$PARU_CONF" 2>/dev/null; then
|
||||
printf '\n[moonarch-pkgbuilds]\nUrl = https://gitea.moonarch.de/nevaforget/moonarch-pkgbuilds.git\n' \
|
||||
| sudo tee -a "$PARU_CONF" > /dev/null
|
||||
log " + Moonarch repo added to paru.conf."
|
||||
else
|
||||
log " ~ Moonarch repo already in paru.conf."
|
||||
fi
|
||||
|
||||
# Install/update moonarch-git (paru repo config is set up by moonarch.install hook)
|
||||
paru -Syu --pkgbuilds --noconfirm
|
||||
|
||||
log "Installing moonarch-git package..."
|
||||
|
||||
Reference in New Issue
Block a user