From: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Date: Mon, 15 Sep 2025 15:44:06 +0000 (+0000) Subject: Fix remaining tilde usages in version fallback and RPM packaging X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44cb75bc57b7db5cd8572fbfe2837f3dc7cbf6cb;p=thirdparty%2Ftvheadend.git Fix remaining tilde usages in version fallback and RPM packaging Co-authored-by: Flole998 <9951871+Flole998@users.noreply.github.com> --- diff --git a/rpm/Makefile b/rpm/Makefile index 8e1042d2d..e9116986b 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -26,7 +26,7 @@ COMMIT ?= $(shell git rev-parse HEAD) COMMIT1 = $(shell git rev-parse $(COMMIT)) FVERSION = $(shell cd .. && git describe --match "v*" $(COMMIT1) | sed "s/^v//") VERSION = $(shell echo "$(FVERSION)" | cut -d '-' -f 1) -RELEASE = $(shell echo "$(FVERSION)" | cut -d '-' -f 2-10 | sed "s/-/~/g") +RELEASE = $(shell echo "$(FVERSION)" | cut -d '-' -f 2-10) VERSION ?= "0.0.0" RELEASE ?= 1 ifeq ($(VERSION),$(RELEASE)) diff --git a/support/version b/support/version index 90b842050..f0f7ef592 100755 --- a/support/version +++ b/support/version @@ -25,7 +25,7 @@ else VER=$(basename $(realpath $(dirname "$0")/..) | sed -e 's/^tvheadend-//' | sed -e 's/^tvheadend-v//') case $VER in [1-9]*\.[0-9]*) ;; - *) VER="0.0.0~unknown" ;; + *) VER="0.0.0-unknown" ;; esac fi