diff --git a/packages/dotnet8.0/build.sh b/packages/dotnet8.0/build.sh index 36cf59e76a..0786003e5c 100644 --- a/packages/dotnet8.0/build.sh +++ b/packages/dotnet8.0/build.sh @@ -2,9 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://dotnet.microsoft.com/en-us/ TERMUX_PKG_DESCRIPTION=".NET 8.0" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@truboxl" -TERMUX_PKG_VERSION="8.0.18" +TERMUX_PKG_VERSION="8.0.20" +_DOTNET_SDK_VERSION="8.0.120" TERMUX_PKG_SRCURL=git+https://github.com/dotnet/dotnet -TERMUX_PKG_GIT_BRANCH="v${TERMUX_PKG_VERSION}" +TERMUX_PKG_GIT_BRANCH="v${_DOTNET_SDK_VERSION}" TERMUX_PKG_BUILD_DEPENDS="krb5, libicu, openssl, zlib" TERMUX_PKG_SUGGESTS="dotnet-sdk-8.0" TERMUX_PKG_BUILD_IN_SRC=true @@ -29,6 +30,10 @@ termux_pkg_auto_update() { return fi + sed \ + -e "s|^_DOTNET_SDK_VERSION=.*|_DOTNET_SDK_VERSION=\"8.0.1${latest_version##*.}\"|" \ + -i "${TERMUX_PKG_BUILDER_DIR}/build.sh" + termux_pkg_upgrade_version "${latest_version}" } @@ -167,16 +172,7 @@ termux_step_make() { /p:OverrideTargetRid=linux-bionic-${arch} "${TERMUX_PKG_BUILDDIR}/.dotnet/dotnet" build-server shutdown - - local dotnet_process=$(pgrep dotnet) - if [[ -n "$dotnet_process" ]]; then - echo "WARN: Dangling process, forcibly killing" - local pid - for pid in ${dotnet_process}; do - echo "${pid}: $(cat /proc/${pid}/cmdline | tr '\0' ' ')" - kill "$pid" - done - fi + termux_dotnet_kill } termux_step_make_install() {