Commit 1a0b64eb authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm play: drop update_url_if_need_mirrored, we hope eget will helps us

parent 1760703b
...@@ -11,13 +11,6 @@ eget() ...@@ -11,13 +11,6 @@ eget()
epm tool eget "$@" epm tool eget "$@"
} }
check_url_is_accessible()
{
local res
eget --check "$1"
}
cd_to_temp_dir() cd_to_temp_dir()
{ {
PKGDIR=$(mktemp -d) PKGDIR=$(mktemp -d)
...@@ -39,37 +32,16 @@ is_supported_arch() ...@@ -39,37 +32,16 @@ is_supported_arch()
return 1 return 1
} }
# update URL variable
update_url_if_need_mirrored()
{
local MIRROR="$1"
local SECONDURL
check_url_is_accessible "$URL" && return
if [ -n "$MIRROR" ] ; then
check_url_is_accessible "$MIRROR" && URL="$MIRROR"
return
fi
MIRROR="https://mirror.eterfund.ru"
SECONDURL="$(echo "$URL" | sed -e "s|^.*://|$MIRROR/|")"
check_url_is_accessible "$SECONDURL" && URL="$SECONDURL" && return
MIRROR="https://mirror.eterfund.org"
SECONDURL="$(echo "$URL" | sed -e "s|^.*://|$MIRROR/|")"
check_url_is_accessible "$SECONDURL" && URL="$SECONDURL" && return
}
get_latest_version() get_latest_version()
{ {
local epmver="$(epm --short --version)" local epmver="$(epm --short --version)"
# TODO: use check_url_is_accessible with more short URL (domain?) # TODO: use check_url_is_accessible with more short URL (domain?)
URL="https://eepm.ru/releases/$epmver/app-versions" local URL="https://eepm.ru/releases/$epmver/app-versions"
if ! update_url_if_need_mirrored ; then if ! eget -q -O- "$URL/$1" ; then
URL="https://eepm.ru/app-versions" URL="https://eepm.ru/app-versions"
update_url_if_need_mirrored || return eget -q -O- "$URL/$1"
fi fi
epm tool eget -q -O- "$URL/$1"
} }
print_product_alt() print_product_alt()
......
...@@ -28,7 +28,6 @@ fi ...@@ -28,7 +28,6 @@ fi
# See also https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=yandex-browser-beta # See also https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=yandex-browser-beta
URL="https://repo.yandex.ru/yandex-browser" URL="https://repo.yandex.ru/yandex-browser"
update_url_if_need_mirrored || update_url_if_need_mirrored https://download.etersoft.ru/pub/download/yandex-browser
if [ "$(epm print info -s)" = "alt" ] || [ "$(epm print info -p)" != "rpm" ] ; then if [ "$(epm print info -s)" = "alt" ] || [ "$(epm print info -p)" != "rpm" ] ; then
# epm uses eget to download * names # epm uses eget to download * names
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment