diff --git a/mirrors/Makefile.am b/mirrors/Makefile.am index 8efe46c..746234c 100644 --- a/mirrors/Makefile.am +++ b/mirrors/Makefile.am @@ -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 @@ -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) @@ -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) \ diff --git a/mirrors/oceania/mirrors.wale.id.au b/mirrors/oceania/mirrors.wale.id.au new file mode 100644 index 0000000..76456c9 --- /dev/null +++ b/mirrors/oceania/mirrors.wale.id.au @@ -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" diff --git a/scripts/pkg.in b/scripts/pkg.in index 53061ab..b89a6cd 100644 --- a/scripts/pkg.in +++ b/scripts/pkg.in @@ -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. diff --git a/scripts/termux-change-repo.in b/scripts/termux-change-repo.in index c65d424..4de0da8 100644 --- a/scripts/termux-change-repo.in +++ b/scripts/termux-change-repo.in @@ -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)" @@ -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 @@ -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")