epm repo change: add support for ftp.altlinux.org and mirror.eterfund.org

bcd1c377 · Vitaly Lipatov · fc157436 · bcd1c377 · bcd1c377
Commit bcd1c377 authored Oct 27, 2023 by Vitaly Lipatov
Hide whitespace changes
Inline Side-by-side

Showing with 32 additions and 2 deletions

epm-repo bin/epm-repo +1 -1

epm-repofix bin/epm-repofix +31 -1

No files found.
--- a/bin/epm-repo
+++ b/bin/epm-repo
@@ -46,7 +46,7 @@ epm_repo()
        load_helper epm-repolist
        epm_repolist "$@"
        ;;
-    change)                           # HELPCMD: <mirror>: switch sources to the mirror (supports etersoft/yandex/basealt): rewrite URLs to the specified server
+    change)                           # HELPCMD: <mirror>: switch sources to the mirror (supports etersoft/yandex/basealt/altlinux.org/eterfund.org): rewrite URLs to the specified server
        load_helper epm-repofix
        epm_repofix "$@"
        ;;

--- a/bin/epm-repofix
+++ b/bin/epm-repofix
@@ -175,6 +175,16 @@ __subst_with_etersoft_url()
    echo "$1" | sed \
        -e "s|h\?f\?t\?tp://ftp.altlinux.org/pub/distributions/* ALTLinux|$NURL|" \
        -e "s|h\?f\?t\?tp://ftp.basealt.ru/pub/distributions/* ALTLinux|$NURL|" \
+        -e "s|h\?f\?t\?tp://mirror.yandex.ru/* altlinux|$NURL|" \
+        -e "s|h\?f\?t\?tp://mirror.eterfund.org/download.etersoft.ru/pub/* ALTLinux|$NURL|"
+}
+
+__subst_with_eterfund_url()
+{
+    local NURL="https://mirror.eterfund.org/download.etersoft.ru/pub ALTLinux"
+    echo "$1" | sed \
+        -e "s|h\?f\?t\?tp://ftp.altlinux.org/pub/distributions/* ALTLinux|$NURL|" \
+        -e "s|h\?f\?t\?tp://ftp.basealt.ru/pub/distributions/* ALTLinux|$NURL|" \
        -e "s|h\?f\?t\?tp://mirror.yandex.ru/* altlinux|$NURL|"
 }

@@ -185,7 +195,8 @@ __subst_with_yandex_url()
        -e "s|h\?f\?t\?tp://ftp.altlinux.org/pub/distributions/* ALTLinux|$NURL|" \
        -e "s|h\?f\?t\?tp://ftp.basealt.ru/pub/distributions/* ALTLinux|$NURL|" \
        -e "s|h\?f\?t\?tp://ftp.etersoft.ru/pub/* ALTLinux|$NURL|" \
-        -e "s|h\?f\?t\?tp://download.etersoft.ru/pub/* ALTLinux|$NURL|"
+        -e "s|h\?f\?t\?tp://download.etersoft.ru/pub/* ALTLinux|$NURL|" \
+        -e "s|h\?f\?t\?tp://mirror.eterfund.org/download.etersoft.ru/pub/* ALTLinux|$NURL|"
 }

 __subst_with_basealt_url()
@@ -194,6 +205,17 @@ __subst_with_basealt_url()
    echo "$1" | sed \
        -e "s|h\?f\?t\?tp://mirror.yandex.ru/* altlinux|$NURL|" \
        -e "s|h\?f\?t\?tp://ftp.etersoft.ru/pub/* ALTLinux|$NURL|" \
+        -e "s|h\?f\?t\?tp://mirror.eterfund.org/download.etersoft.ru/pub/* ALTLinux|$NURL|" \
+        -e "s|h\?f\?t\?tp://download.etersoft.ru/pub/* ALTLinux|$NURL|"
+}
+
+__subst_with_altlinux_url()
+{
+    local NURL="http://ftp.altlinux.org/pub/distributions ALTLinux"
+    echo "$1" | sed \
+        -e "s|h\?f\?t\?tp://mirror.yandex.ru/* altlinux|$NURL|" \
+        -e "s|h\?f\?t\?tp://ftp.etersoft.ru/pub/* ALTLinux|$NURL|" \
+        -e "s|h\?f\?t\?tp://mirror.eterfund.org/download.etersoft.ru/pub/* ALTLinux|$NURL|" \
        -e "s|h\?f\?t\?tp://download.etersoft.ru/pub/* ALTLinux|$NURL|"
 }

@@ -246,6 +268,10 @@ case $BASEDISTRNAME in
            __fix_repo_to_etersoft /etc/apt/sources.list
            __fix_repo_to_etersoft /etc/apt/sources.list.d/*.list
        fi
+        if [ "$1" = "eterfund.org" ] ; then
+            __fix_repo_to_eterfund /etc/apt/sources.list
+            __fix_repo_to_eterfund /etc/apt/sources.list.d/*.list
+        fi
        if [ "$1" = "yandex" ] ; then
            __fix_repo_to_yandex /etc/apt/sources.list
            __fix_repo_to_yandex /etc/apt/sources.list.d/*.list
@@ -254,6 +280,10 @@ case $BASEDISTRNAME in
            __fix_repo_to_basealt /etc/apt/sources.list
            __fix_repo_to_basealt /etc/apt/sources.list.d/*.list
        fi
+        if [ "$1" = "altlinux.org" ] ; then
+            __fix_repo_to_altlinux /etc/apt/sources.list
+            __fix_repo_to_altlinux /etc/apt/sources.list.d/*.list
+        fi
        docmd apt-repo list
        return
        ;;