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

Add mirror group for Oceania #35

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 2 commits into from
Feb 14, 2023
Merged

Add mirror group for Oceania #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bc7ee5
mirrors: add first mirror in Oceania: mirrors.wale.id.au
Grimler91 Feb 10, 2023
03336c9
scripts: recognise new mirror group "Oceania" as well
Grimler91 Feb 10, 2023
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
9 changes: 7 additions & 2 deletions mirrors/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ pkgdata_NORTH_AMERICA_MIRRORS = plug-mirror.rcac.purdue.edu \
dl.kcubeterm.com mirrors.utermux.dev mirror.fcix.net mirror.mwt.me \
mirror.vern.cc mirror.csclub.uwaterloo.ca

# Mirrors in Oceania
pkgdata_OCEANIA_MIRRORS = mirrors.wale.id.au

# Mirrors in Russia
pkgdata_RUSSIA_MIRRORS = mirror.mephi.ru mirror.surf

Expand All @@ -49,12 +52,14 @@ $(eval $(call install-mirror-rule,asia,ASIA))
$(eval $(call install-mirror-rule,china,CHINA))
$(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,russia,RUSSIA))

$(eval $(call uninstall-mirror-rule,asia,ASIA))
$(eval $(call uninstall-mirror-rule,china,CHINA))
$(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,russia,RUSSIA))

install-default: $(pkgdata_MIRRORS)
Expand All @@ -70,9 +75,9 @@ uninstall-default:
done
-rmdir $(DESTDIR)$(sysconfdir)/termux/mirrors

install-data-local: install-default install-asia install-china install-europe install-north_america install-russia
install-data-local: install-default install-asia install-china install-europe install-north_america install-oceania install-russia

uninstall-local: uninstall-default uninstall-asia uninstall-china uninstall-europe uninstall-north_america uninstall-russia
uninstall-local: uninstall-default uninstall-asia uninstall-china uninstall-europe uninstall-north_america uninstall-oceania uninstall-russia

EXTRA_DIST = $(pkgdata_MIRRORS) $(pkgdata_ASIA_MIRRORS) \
$(pkgdata_CHINA_MIRRORS) $(pkgdata_EUROPE_MIRRORS) \
Expand Down
6 changes: 6 additions & 0 deletions mirrors/oceania/mirrors.wale.id.au
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# This file is sourced by pkg
# Mirror by wale, hosted in Sydney
WEIGHT=1
MAIN="https://mirrors.wale.id.au/termux/termux-main"
ROOT="https://mirrors.wale.id.au/termux/termux-root"
X11="https://mirrors.wale.id.au/termux/termux-x11"
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 @@ -135,11 +135,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,china,europe,north_america,russia}/ -type f ! -name "*\.dpkg-old" ! -name "*\.dpkg-new" ! -name "*~"))
mirrors+=($(find ${MIRROR_BASE_DIR}/{asia,china,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,china,europe,north_america,russia}/ -type f ! -name "*\.dpkg-old" ! -name "*\.dpkg-new" ! -name "*~"))
mirrors+=($(find ${MIRROR_BASE_DIR}/{asia,china,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: 6 additions & 1 deletion scripts/termux-change-repo.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ select_repository_group() {
MIRRORS+=("Mirrors in China" "All in China" "off")
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 Russia" "All in Russia" "off")

local TEMPFILE="$(mktemp @TERMUX_PREFIX@/tmp/mirror.XXXXXX)"
Expand Down Expand Up @@ -68,6 +69,10 @@ select_repository_group() {
echo "[*] Mirrors in North America selected"
unlink_and_link ${MIRROR_BASE_DIR}/north_america

elif [ "$mirror_group" == "Mirrors in Oceania" ]; then
echo "[*] Mirrors in Oceania selected"
unlink_and_link ${MIRROR_BASE_DIR}/oceania

elif [ "$mirror_group" == "Mirrors in Russia" ]; then
echo "[*] Mirrors in Russia selected"
unlink_and_link ${MIRROR_BASE_DIR}/russia
Expand All @@ -91,7 +96,7 @@ get_mirror_description() {
}

select_individual_mirror() {
mirrors=($(find ${MIRROR_BASE_DIR}/{asia,china,europe,north_america,russia}/ -type f ! -name "*\.dpkg-old" ! -name "*\.dpkg-new" ! -name "*~"))
mirrors=($(find ${MIRROR_BASE_DIR}/{asia,china,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