From: Bastian Dehn <hhaalo@arcor.de>
Date: Fri, 24 Apr 2026 11:07:04 +0000 (+0200)
Subject: add extra version for file name
X-Git-Tag: 1.3.20^2~6
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=3a57d58678ddb7cd7508f1892c6711e4bec664d9;p=feierabend.git

add extra version for file name
---

diff --git a/builder/builder b/builder/builder
index b737997..de080ea 100755
--- a/builder/builder
+++ b/builder/builder
@@ -25,7 +25,7 @@ run_build_container()
 
 	podman run \
 		--rm \
-		-v ./:/src \
+		-v .:/src \
 		-e SOLL_HOUR=$SOLL_HOUR \
 		-e SOLL_MINUTES=$SOLL_MINUTES \
 		feierabend-builder-$distro_postfix
diff --git a/builder/run b/builder/run
index da5a0d0..e5161cc 100644
--- a/builder/run
+++ b/builder/run
@@ -14,20 +14,12 @@ build()
 
 	mkdir -p /app/build && cd /app/build
 	cmake -DCMAKE_BUILD_TYPE=Release \
+		-DEXTRA_VERSION="-$ID-$VERSION_CODENAME" \
 		-DSOLL_HOUR="$soll_hour" \
 		-DSOLL_MINUTES="$soll_minutes" /src
 	make -j$(nproc) package
 }
 
-rename_package()
-{
-	cd /app/build
-	local package_name=$(find . -maxdepth 1 -name '*.deb')
-	local new_package_name=${package_name/.deb/-$ID-$VERSION_CODENAME.deb}
-
-	mv "$package_name" "$new_package_name"
-}
-
 copy_package()
 {
 	cp /app/build/*.deb /src/build/
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0d55422..a8c7049 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -50,7 +50,7 @@ set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
 set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
 set(CPACK_DEBIAN_PACKAGE_NAME ${PROJECT_NAME})
 set(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_HOST_SYSTEM_PROCESSOR})
-set(CPACK_DEBIAN_FILE_NAME ${PROJECT_NAME}_${PROJECT_VERSION}-1_${CMAKE_HOST_SYSTEM_PROCESSOR}.deb)
+set(CPACK_DEBIAN_FILE_NAME ${PROJECT_NAME}_${PROJECT_VERSION}-1${EXTRA_VERSION}_${CMAKE_HOST_SYSTEM_PROCESSOR}.deb)
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 set(CPACK_DEBIAN_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION})
 set(CPACK_DEBIAN_PACKAGE_RELEASE 1)