From 2062db23e62b876d3a1d9063cdac280efd0e9c9d Mon Sep 17 00:00:00 2001 From: Valentin Pechenov Date: Sun, 1 Sep 2024 12:15:40 +0300 Subject: [PATCH] epm play: nekoray: fix version troubles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Изменения в play: исправлено скачивание beta версии, вместо стабильной Изменения в repack: добавлена поддержка версии 4.0, где в некоторых местах nekoray поменялся на nekobox (спасибо им за головную боль) --- play.d/nekoray.sh | 5 +++++ repack.d/nekoray.sh | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/play.d/nekoray.sh b/play.d/nekoray.sh index 2762e0747..ef37d2889 100755 --- a/play.d/nekoray.sh +++ b/play.d/nekoray.sh @@ -10,6 +10,11 @@ URL="https://github.com/MatsuriDayo/nekoray" arch=x64 pkgtype=deb + +if [ "$VERSION" = "*" ] ; then + VERSION="$(eget -O- https://api.github.com/repos/MatsuriDayo/nekoray/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")' | sed 's/v//g')" +fi + PKGURL=$(eget --list --latest https://github.com/MatsuriDayo/nekoray/releases "nekoray-$VERSION-*-debian-$arch.$pkgtype") install_pkgurl diff --git a/repack.d/nekoray.sh b/repack.d/nekoray.sh index d7fe46f31..179273391 100755 --- a/repack.d/nekoray.sh +++ b/repack.d/nekoray.sh @@ -3,8 +3,12 @@ # It will be run with two args: buildroot spec BUILDROOT="$1" SPEC="$2" - -PRODUCT=nekoray +if [ -f $BUILDROOT/opt/nekoray/nekoray ] +then + PRODUCT=nekoray +else + PRODUCT=nekobox +fi PRODUCTDIR=/opt/nekoray . $(dirname $0)/common.sh @@ -18,7 +22,7 @@ cat <