diff --git a/cd.sh b/cd.sh index 3b24eeb..622af39 100644 --- a/cd.sh +++ b/cd.sh @@ -4,8 +4,8 @@ CD_DEFAULT_DNS="\ 9.9.9.9 \ " -CD_DEFAULT_MIRROR_ALMA="https://repo.almalinux.org/almalinux" -CD_DEFAULT_MIRROR_DEBIAN="https://deb.debian.org/debian" +CD_DEFAULT_REPO_ALMA="https://repo.almalinux.org/almalinux" +CD_DEFAULT_REPO_DEBIAN="https://deb.debian.org/debian" CD_PYTHON_MODULES="\ cd \ @@ -66,6 +66,8 @@ local text # case "${CD_OS_ID}" in "${CD_OS_DEBIAN}") + CD_OS_REPO="${CD_DEFAULT_REPO_DEBIAN}" + [ "${CD_REPO_DEBIAN}" ] && CD_OS_REPO="${CD_REPO_DEBIAN}" case "${CD_OS_VERSION}" in "bookworm"|"bullseye") cd_nop ;; *) cd_error_os "CD_OS_VERSION" ;; @@ -76,6 +78,8 @@ local text CD_PYTHON_PACKAGES="/usr/lib/python3/dist-packages" ;; "${CD_OS_ALMA}") + CD_OS_REPO="${CD_DEFAULT_REPO_ALMA}" + [ "${CD_REPO_ALMA}" ] && CD_OS_REPO="${CD_REPO_ALMA}" case "${CD_OS_VERSION}" in "8."*|"9."*) cd_nop ;; *) cd_error_os "CD_OS_VERSION" ;; @@ -147,15 +151,18 @@ local file case "${CD_OS_ID}" in "${CD_OS_DEBIAN}") cd_write "/etc/apt/sources.list" "\ -deb https://deb.debian.org/debian ${CD_OS_VERSION} main -deb https://deb.debian.org/debian ${CD_OS_VERSION}-backports main -deb https://deb.debian.org/debian ${CD_OS_VERSION}-updates main -deb https://deb.debian.org/debian-security ${CD_OS_VERSION}-security main +deb ${CD_OS_REPO} ${CD_OS_VERSION} main +deb ${CD_OS_REPO} ${CD_OS_VERSION}-backports main +deb ${CD_OS_REPO} ${CD_OS_VERSION}-updates main +deb ${CD_OS_REPO}-security ${CD_OS_VERSION}-security main " ;; "${CD_OS_ALMA}") file="/etc/yum.repos.d/almalinux.repo" - cd_sed "${file}" "|^m|# m|" "|^# b|b|" + cd_sed "${file}" \ + "|^mirrorlist|# mirrorlist|" \ + "|${CD_DEFAULT_REPO_ALMA}|${CD_OS_REPO}|" \ + "|^# baseurl|baseurl|" cd_cat "${file}" ;; esac diff --git a/readme.md b/readme.md index 959b897..6f37a17 100644 --- a/readme.md +++ b/readme.md @@ -20,14 +20,15 @@ from various CA, CI, OCI / OS. ## How -| Variable | Description | -|----------|-------------------------| -| CD_CA_n | Numbered CA certificate | -| CD_DNS | Space separated servers | +| Variable | Description | +|----------------|-------------------------| +| CD_CA_n | Numbered CA certificate | +| CD_DNS | Space separated servers | +| CD_REPO_ALMA | Alma repository URL | +| CD_REPO_DEBIAN | Debian repository URL | ## Tasks * integrate project repository cloning * override repository and framework locations -* redefine package repositories mirror locations * write Python bootstrap