这是indexloc提供的服务，不要输入任何密码
Skip to content

mirrors: remove mirrors.rda.run #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 26, 2024
Merged

mirrors: remove mirrors.rda.run #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions mirrors/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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



Expand All @@ -102,15 +100,13 @@ $(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))
$(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))


Expand Down Expand Up @@ -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)
6 changes: 0 additions & 6 deletions mirrors/south_america/mirrors.rda.run
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions scripts/pkg.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
7 changes: 1 addition & 6 deletions scripts/termux-change-repo.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down Expand Up @@ -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
Expand All @@ -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")
Expand Down