Fixes to the aarch64 stormux repository.

.includes/functions.sh

@@ -28,11 +28,18 @@ attention() {
 }
 
 add_stormux_repo() {
-    # Check if StormUX repository is already configured
-    if grep -q "aarch64.stormux.org" /etc/pacman.conf; then
+    # Check if StormUX repository is already configured correctly
+    if grep -q "aarch64.stormux.org/\$repo-\$arch" /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
@@ -53,11 +60,25 @@ 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/" >> "$temp_conf"
+            echo "Server = https://aarch64.stormux.org/\$repo-\$arch" >> "$temp_conf"
             echo "" >> "$temp_conf"
             added_repo=true
         fi
@@ -69,7 +90,7 @@ add_stormux_repo() {
         echo "" >> "$temp_conf"
         echo "[stormux]" >> "$temp_conf"
         echo "SigLevel = Required" >> "$temp_conf"
-        echo "Server = https://aarch64.stormux.org/" >> "$temp_conf"
+        echo "Server = https://aarch64.stormux.org/\$repo-\$arch" >> "$temp_conf"
     fi
     
     # Replace the original pacman.conf
@@ -112,18 +133,18 @@ install_xlibre() {
     
     # Install X11Libre packages from StormUX repository
     infobox "Installing X11Libre server and drivers..."
-    if ! sudo "${sudoFlags[@]}" pacman -S --noconfirm xlibre-server-common-git xlibre-server-devel-git; then
+    if ! sudo "${sudoFlags[@]}" pacman -S --noconfirm xlibre-server-common xlibre-server-devel; then
         msgbox "Failed to install X11Libre server components."
         return 1
     fi
     
-    if ! sudo "${sudoFlags[@]}" pacman -Sdd --noconfirm xlibre-server-git; then
+    if ! sudo "${sudoFlags[@]}" pacman -Sdd --noconfirm xlibre-server; then
         msgbox "Failed to install X11Libre server main package."
         return 1
     fi
     
     # Install input and video drivers from StormUX repository
-    if ! sudo "${sudoFlags[@]}" pacman -S --noconfirm stormux/xf86-input-libinput-xlibre stormux/xf86-video-dummy-with-vt stormux/xf86-video-fbdev; then
+    if ! sudo "${sudoFlags[@]}" pacman -S --noconfirm xlibre-input-libinput xlibre-video-dummy-with-vt xlibre-video-fbdev; then
         msgbox "Failed to install X11Libre input and video drivers."
         return 1
     fi