From 1257eb31ab22b59799ecf87b61aea79915789b76 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Thu, 17 Jul 2025 18:35:10 -0400 Subject: [PATCH] Battling with repository still. --- .includes/functions.sh | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/.includes/functions.sh b/.includes/functions.sh index 82d5e95..09b95d4 100755 --- a/.includes/functions.sh +++ b/.includes/functions.sh @@ -28,18 +28,11 @@ attention() { } add_stormux_repo() { - # Check if StormUX repository is already configured correctly - if grep -q "aarch64.stormux.org/\$repo-\$arch" /etc/pacman.conf; then + # Check if StormUX repository is already configured + if grep -q "aarch64.stormux.org" /etc/pacman.conf; then return 0 fi - # Check if old format exists and needs fixing - local needs_fixing=false - if grep -q "aarch64.stormux.org" /etc/pacman.conf && ! grep -q "aarch64.stormux.org/\$repo-\$arch" /etc/pacman.conf; then - needs_fixing=true - infobox "Updating StormUX repository configuration..." - fi - infobox "Adding StormUX repository and importing signing key..." # Import the repository signing key @@ -60,25 +53,11 @@ add_stormux_repo() { local added_repo=false while IFS= read -r line; do - # Skip existing stormux repository entries if we're fixing them - if [[ "$needs_fixing" == true ]] && [[ "$line" =~ ^\[stormux\]$ ]]; then - # Skip the [stormux] line and the next lines until we hit an empty line or another section - while IFS= read -r skip_line && [[ -n "$skip_line" ]] && [[ ! "$skip_line" =~ ^\[.*\]$ ]]; do - continue - done - # Put back the line we read (if it's a section header) - if [[ "$skip_line" =~ ^\[.*\]$ ]]; then - line="$skip_line" - else - continue - fi - fi - # Add StormUX repo before any AUR or custom repo sections if [[ "$line" =~ ^\[.*\]$ ]] && [[ ! "$line" =~ ^\[(core|extra|multilib|testing|multilib-testing)\]$ ]] && [[ "$added_repo" == false ]]; then echo "[stormux]" >> "$temp_conf" echo "SigLevel = Required" >> "$temp_conf" - echo "Server = https://aarch64.stormux.org/\$repo-\$arch" >> "$temp_conf" + echo "Server = https://aarch64.stormux.org/" >> "$temp_conf" echo "" >> "$temp_conf" added_repo=true fi