From aadee78eed4ee1c62c3341f1f23321772f6c1a32 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Mon, 8 Feb 2021 12:55:53 +0200 Subject: [PATCH] scripts: prepare for Bintray deprecation Use termux.org as main repo host. grimler.se / *.termux-mirror.ml for others. --- scripts/build/termux_step_setup_variables.sh | 12 ++++++------ scripts/check-built-packages.py | 2 +- scripts/generate-bootstraps.sh | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/build/termux_step_setup_variables.sh b/scripts/build/termux_step_setup_variables.sh index 55f6032c9..66b7b0f5f 100644 --- a/scripts/build/termux_step_setup_variables.sh +++ b/scripts/build/termux_step_setup_variables.sh @@ -30,12 +30,12 @@ termux_step_setup_variables() { : "${TERMUX_PKG_MAINTAINER:="default"}" TERMUX_REPO_URL=( - https://dl.bintray.com/termux/termux-packages-24 - https://dl.bintray.com/grimler/game-packages-24 - https://dl.bintray.com/grimler/science-packages-24 - https://dl.bintray.com/grimler/termux-root-packages-24 - https://dl.bintray.com/xeffyr/unstable-packages - https://dl.bintray.com/xeffyr/x11-packages + https://termux.org/packages + https://grimler.se/game-packages-24 + https://grimler.se/science-packages-24 + https://grimler.se/termux-root-packages-24 + https://unstable.termux-mirror.ml + https://x11.termux-mirror.ml ) TERMUX_REPO_DISTRIBUTION=( diff --git a/scripts/check-built-packages.py b/scripts/check-built-packages.py index 0de8a53e3..2ccb077b7 100755 --- a/scripts/check-built-packages.py +++ b/scripts/check-built-packages.py @@ -29,6 +29,6 @@ def check_manifest(arch, manifest): current_package[parts[0].strip()] = parts[1].strip() for arch in ['all', 'aarch64', 'arm', 'i686', 'x86_64']: - manifest_url = f'https://dl.bintray.com/termux/termux-packages-24/dists/stable/main/binary-{arch}/Packages' + manifest_url = f'https://termux.org/packages/dists/stable/main/binary-{arch}/Packages' with urllib.request.urlopen(manifest_url) as manifest: check_manifest(arch, manifest) diff --git a/scripts/generate-bootstraps.sh b/scripts/generate-bootstraps.sh index 38fd492b3..6a58436a0 100755 --- a/scripts/generate-bootstraps.sh +++ b/scripts/generate-bootstraps.sh @@ -19,7 +19,7 @@ BOOTSTRAP_ANDROID10_COMPATIBLE=false TERMUX_ARCHITECTURES=("aarch64" "arm" "i686" "x86_64") # Can be changed by using '--repository' option. -REPO_BASE_URL="https://dl.bintray.com/termux/termux-packages-24" +REPO_BASE_URL="https://termux.org/packages" # A list of non-essential packages. By default it is empty, but can # be filled with option '--add'.