From 57543f20d534379efc8d388261960b3d9b487951 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Tue, 27 Aug 2024 15:43:19 +0200
Subject: [PATCH] repos/fixes

---
 spcd/bootstrap.sh | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 7d7bb7f..ff0b43f 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -834,23 +834,20 @@ spcd_step__packages_set_repositories() {
         esac
         spcd_os_sed "${spcd_spr__file}" \
             "|^mirrorlist|# mirrorlist|" \
-            "|${SPCD_URL_DEFAULT}|${SPCD_URL_CHOSEN}|" \
             "|^# baseurl|baseurl|"
         ;;
     "${SPCD_OS_ALPINE}")
-        spcd_spr__file="/etc/apk/repositories"
-        spcd_os_write "${spcd_spr__file}" "\
-${SPCD_URL_CHOSEN}/v${SPCD_OS_VERSION}/main
-${SPCD_URL_CHOSEN}/v${SPCD_OS_VERSION}/community
+        spcd_os_write "/etc/apk/repositories" "\
+${SPCD_URL_ALPINE}/v${SPCD_OS_VERSION}/main
+${SPCD_URL_ALPINE}/v${SPCD_OS_VERSION}/community
 "
         ;;
     "${SPCD_OS_DEBIAN}")
-        spcd_spr__file="/etc/apt/sources.list"
-        spcd_os_write "${spcd_spr__file}" "\
-deb ${SPCD_URL_CHOSEN} ${SPCD_OS_VERSION} main
-deb ${SPCD_URL_CHOSEN} ${SPCD_OS_VERSION}-backports main
-deb ${SPCD_URL_CHOSEN} ${SPCD_OS_VERSION}-updates main
-deb ${SPCD_URL_CHOSEN}-security ${SPCD_OS_VERSION}-security main
+        spcd_os_write "/etc/apt/sources.list" "\
+deb ${SPCD_URL_DEBIAN} ${SPCD_OS_VERSION} main
+deb ${SPCD_URL_DEBIAN} ${SPCD_OS_VERSION}-backports main
+deb ${SPCD_URL_DEBIAN} ${SPCD_OS_VERSION}-updates main
+deb ${SPCD_URL_DEBIAN}-security ${SPCD_OS_VERSION}-security main
 "
         ;;
     "${SPCD_OS_OPENSUSE}")
@@ -863,7 +860,7 @@ deb ${SPCD_URL_CHOSEN}-security ${SPCD_OS_VERSION}-security main
             "update" \
             "openh264"; do
             spcd_os_sed "/etc/zypp/repos.d/repo-${spcd_spr__file}.repo" \
-                "|${SPCD_URL_DEFAULT}|${SPCD_URL_CHOSEN}|"
+                "|http://download.opensuse.org|${SPCD_URL_OPENSUSE}|"
         done
         ;;
     "${SPCD_OS_ROCKY}")
@@ -874,16 +871,15 @@ deb ${SPCD_URL_CHOSEN}-security ${SPCD_OS_VERSION}-security main
         esac
         spcd_os_sed "${spcd_spr__file}" \
             "|^mirrorlist|# mirrorlist|" \
-            "|${SPCD_URL_DEFAULT}|${SPCD_URL_CHOSEN}|" \
+            "|http://dl.rockylinux.org/\$contentdir|${SPCD_URL_ROCKY}|" \
             "|^#baseurl|baseurl|"
         ;;
     "${SPCD_OS_UBUNTU}")
-        spcd_spr__file="/etc/apt/sources.list"
-        spcd_os_write "${spcd_spr__file}" "\
-deb ${SPCD_URL_CHOSEN} ${SPCD_OS_VERSION} main universe
-deb ${SPCD_URL_CHOSEN} ${SPCD_OS_VERSION}-backports main universe
-deb ${SPCD_URL_CHOSEN} ${SPCD_OS_VERSION}-updates main universe
-deb ${SPCD_URL_CHOSEN} ${SPCD_OS_VERSION}-security main universe
+        spcd_os_write "/etc/apt/sources.list" "\
+deb ${SPCD_URL_UBUNTU} ${SPCD_OS_VERSION} main universe
+deb ${SPCD_URL_UBUNTU} ${SPCD_OS_VERSION}-backports main universe
+deb ${SPCD_URL_UBUNTU} ${SPCD_OS_VERSION}-updates main universe
+deb ${SPCD_URL_UBUNTU} ${SPCD_OS_VERSION}-security main universe
 "
         ;;
     *) ;;