removed invalid chars from version for synology packet

mdzio · Jun 21, 2021 · ffed529 · ffed529
1 parent b0c434a
commit ffed529
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/ccu-historian/build.properties b/ccu-historian/build.properties
@@ -1,2 +1,2 @@
 # version of this build
-version=2.7.0-beta.4
+version=2.7.0-beta.2
diff --git a/ccu-historian/src/mdz/ccuhistorian/Main.groovy b/ccu-historian/src/mdz/ccuhistorian/Main.groovy
@@ -24,7 +24,7 @@ import mdz.hc.persistence.Storage
 
 class Main {
 
-	public static String version='2.7.0-beta.4'
+	public static String version='2.7.0-beta.2'
 
 	private static final Logger log=Logger.getLogger(Main.class.name)
 	private static Main main

diff --git a/dist-synology/build.xml b/dist-synology/build.xml
@@ -2,14 +2,25 @@
 <project name="dist-synology" default="build">
 	<!-- setup properties -->
 	<property file="../ccu-historian/build.properties" />
-	<property name="destfile" value="build/ccu-historian-${version}.spk" />
 	<property name="tmpdir" value="build/tmp" />
 	<condition property="betaflag" value="yes" else="no">
 		<or>
 			<contains string="${version}" substring="alpha" />
 			<contains string="${version}" substring="beta" />
 		</or>
 	</condition>
+	<!-- clean up version for DSM -->
+	<loadresource property="cleanVersion">
+		<propertyresource name="version" />
+		<filterchain>
+			<tokenfilter>
+				<filetokenizer />
+				<replacestring from="alpha." to="" />
+				<replacestring from="beta." to="" />
+			</tokenfilter>
+		</filterchain>
+	</loadresource>
+	<property name="destfile" value="build/ccu-historian-${cleanVersion}.spk" />
 
 	<target name="build">
 		<mkdir dir="${tmpdir}" />

diff --git a/dist-synology/src/root/INFO b/dist-synology/src/root/INFO
@@ -1,7 +1,7 @@
 package="ccu-historian"
 displayname="CCU-Historian"
 displayname_ger="CCU-Historian"
-version="${version}"
+version="${cleanVersion}"
 description="CCU-Historian provides a long term archive for the central component (CCU) of the home automation system Homematic by the company eQ-3."
 description_ger="CCU-Historian stellt ein Langzeitarchiv für die Zentrale (CCU) des Hausautomations-Systems HomeMatic der Firma eQ-3 zur Verfügung."
 arch="noarch"