From 62bef7be82a89de7d1ec46eedc41aa2ef78c5a29 Mon Sep 17 00:00:00 2001 From: Kevin WIlliams Date: Thu, 22 Aug 2024 10:41:48 +0800 Subject: [PATCH] mirrors: remove mirrors.rda.run Signed-off-by: Kevin WIlliams --- mirrors/Makefile.am | 15 +++++---------- mirrors/south_america/mirrors.rda.run | 6 ------ scripts/pkg.in | 4 ++-- scripts/termux-change-repo.in | 7 +------ 4 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 mirrors/south_america/mirrors.rda.run diff --git a/mirrors/Makefile.am b/mirrors/Makefile.am index a6cb247..af8479a 100644 --- a/mirrors/Makefile.am +++ b/mirrors/Makefile.am @@ -36,9 +36,6 @@ termux.danyael.xyz gnlug.org # Mirrors in Oceania pkgdata_OCEANIA_MIRRORS = mirrors.middlendian.com -# Mirrors in South America -pkgdata_SOUTH_AMERICA_MIRRORS = mirrors.rda.run - # Mirrors in Russia pkgdata_RUSSIA_MIRRORS = mirror.mephi.ru repository.su @@ -76,7 +73,8 @@ europe/termux.sahilister.in \ europe/termux.astra.in.ua \ north_america/packages.termux.dev \ oceania/mirrors.wale.id.au \ -russia/mirror.surf +russia/mirror.surf \ +south_america/mirrors.rda.run @@ -102,7 +100,6 @@ $(eval $(call install-mirror-rule,chinese_mainland,CHINESE_MAINLAND)) $(eval $(call install-mirror-rule,europe,EUROPE)) $(eval $(call install-mirror-rule,north_america,NORTH_AMERICA)) $(eval $(call install-mirror-rule,oceania,OCEANIA)) -$(eval $(call install-mirror-rule,south_america,SOUTH_AMERICA)) $(eval $(call install-mirror-rule,russia,RUSSIA)) $(eval $(call uninstall-mirror-rule,asia,ASIA)) @@ -110,7 +107,6 @@ $(eval $(call uninstall-mirror-rule,chinese_mainland,CHINESE_MAINLAND)) $(eval $(call uninstall-mirror-rule,europe,EUROPE)) $(eval $(call uninstall-mirror-rule,north_america,NORTH_AMERICA)) $(eval $(call uninstall-mirror-rule,oceania,OCEANIA)) -$(eval $(call uninstall-mirror-rule,south_america,SOUTH_AMERICA)) $(eval $(call uninstall-mirror-rule,russia,RUSSIA)) @@ -143,11 +139,10 @@ create-deb-control-files: -install-data-local: uninstall-removed-mirrors install-default install-asia install-chinese_mainland install-europe install-north_america install-oceania install-south_america install-russia create-deb-control-files +install-data-local: uninstall-removed-mirrors install-default install-asia install-chinese_mainland install-europe install-north_america install-oceania install-russia create-deb-control-files -uninstall-local: uninstall-removed-mirrors uninstall-default uninstall-asia uninstall-chinese_mainland uninstall-europe uninstall-north_america uninstall-oceania uninstall-south_america uninstall-russia +uninstall-local: uninstall-removed-mirrors uninstall-default uninstall-asia uninstall-chinese_mainland uninstall-europe uninstall-north_america uninstall-oceania uninstall-russia EXTRA_DIST = $(pkgdata_MIRRORS) $(pkgdata_ASIA_MIRRORS) \ $(pkgdata_CHINESE_MAINLAND_MIRRORS) $(pkgdata_EUROPE_MIRRORS) \ -$(pkgdata_NORTH_AMERICA_MIRRORS) $(pkgdata_OCEANIA_MIRRORS) \ -$(pkgdata_SOUTH_AMERICA_MIRRORS) +$(pkgdata_NORTH_AMERICA_MIRRORS) $(pkgdata_OCEANIA_MIRRORS) diff --git a/mirrors/south_america/mirrors.rda.run b/mirrors/south_america/mirrors.rda.run deleted file mode 100644 index a021f0e..0000000 --- a/mirrors/south_america/mirrors.rda.run +++ /dev/null @@ -1,6 +0,0 @@ -# This file is sourced by pkg -# Mirror by Rodrigo de Avila, Hosted in Brochier, Brazil. -WEIGHT=1 -MAIN="https://mirrors.rda.run/termux/termux-main" -ROOT="https://mirrors.rda.run/termux/termux-root" -X11="https://mirrors.rda.run/termux/termux-x11" diff --git a/scripts/pkg.in b/scripts/pkg.in index 4c5f4e7..6bf963a 100644 --- a/scripts/pkg.in +++ b/scripts/pkg.in @@ -178,11 +178,11 @@ select_mirror() { elif [ -L "@TERMUX_PREFIX@/etc/termux/chosen_mirrors" ]; then # Broken symlink, use all mirrors mirrors=("${MIRROR_BASE_DIR}/default") - mirrors+=($(find ${MIRROR_BASE_DIR}/{asia,chinese_mainland,europe,north_america,oceania,south_america,russia}/ -type f ! -name "*\.dpkg-old" ! -name "*\.dpkg-new" ! -name "*~")) + mirrors+=($(find ${MIRROR_BASE_DIR}/{asia,chinese_mainland,europe,north_america,oceania,russia}/ -type f ! -name "*\.dpkg-old" ! -name "*\.dpkg-new" ! -name "*~")) else echo "No mirror or mirror group selected. You might want to select one by running 'termux-change-repo'" mirrors=("${MIRROR_BASE_DIR}/default") - mirrors+=($(find ${MIRROR_BASE_DIR}/{asia,chinese_mainland,europe,north_america,oceania,south_america,russia}/ -type f ! -name "*\.dpkg-old" ! -name "*\.dpkg-new" ! -name "*~")) + mirrors+=($(find ${MIRROR_BASE_DIR}/{asia,chinese_mainland,europe,north_america,oceania,russia}/ -type f ! -name "*\.dpkg-old" ! -name "*\.dpkg-new" ! -name "*~")) fi # Mirrors are rotated if 6 hours timeout has been passed or mirror is no longer accessible. diff --git a/scripts/termux-change-repo.in b/scripts/termux-change-repo.in index e6ca601..6784288 100644 --- a/scripts/termux-change-repo.in +++ b/scripts/termux-change-repo.in @@ -28,7 +28,6 @@ select_repository_group() { MIRRORS+=("Mirrors in Europe" "All in Europe" "off") MIRRORS+=("Mirrors in North America" "All in North America" "off") MIRRORS+=("Mirrors in Oceania" "All in Oceania" "off") - MIRRORS+=("Mirrors in South America" "All in South America" "off") MIRRORS+=("Mirrors in Russia" "All in Russia" "off") local TEMPFILE="$(mktemp @TERMUX_PREFIX@/tmp/mirror.XXXXXX)" @@ -74,10 +73,6 @@ select_repository_group() { echo "[*] Mirrors in Oceania selected" unlink_and_link ${MIRROR_BASE_DIR}/oceania - elif [ "$mirror_group" == "Mirrors in South America" ]; then - echo "[*] Mirrors in South America selected" - unlink_and_link ${MIRROR_BASE_DIR}/south_america - elif [ "$mirror_group" == "Mirrors in Russia" ]; then echo "[*] Mirrors in Russia selected" unlink_and_link ${MIRROR_BASE_DIR}/russia @@ -101,7 +96,7 @@ get_mirror_description() { } select_individual_mirror() { - mirrors=($(find ${MIRROR_BASE_DIR}/{asia,chinese_mainland,europe,north_america,oceania,south_america,russia}/ -type f ! -name "*\.dpkg-old" ! -name "*\.dpkg-new" ! -name "*~")) + mirrors=($(find ${MIRROR_BASE_DIR}/{asia,chinese_mainland,europe,north_america,oceania,russia}/ -type f ! -name "*\.dpkg-old" ! -name "*\.dpkg-new" ! -name "*~")) # Choose default mirror per default MIRRORS=("$(get_mirror_url "${MIRROR_BASE_DIR}/default")" "$(get_mirror_description "${MIRROR_BASE_DIR}/default")" "on")