Set version in wlt_2_comp.py during build

WLANThermo · May 26, 2018 · d21288b · d21288b
1 parent 693dbd2
commit d21288b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build/create_installer.sh b/build/create_installer.sh
@@ -21,6 +21,8 @@ echo Setze Version in der header.php...
 sed -i -e "s/XXX_VERSION_XXX/V${VERSION}/g" ./build/var/www/header.php
 echo Setze Version in der wlt_2_nextion.py...
 sed -i -e "s/XXX_VERSION_XXX/V${VERSION}/g" ./build/usr/sbin/wlt_2_nextion.py
+echo Setze Version in der wlt_2_comp.py...
+sed -i -e "s/XXX_VERSION_XXX/V${VERSION}/g" ./build/usr/sbin/wlt_2_comp.py
 
 PKG_FILE=./package/wlanthermo-$PKG_VERSION.deb
 INSTALLER=./run/WLANThermo_install-$PKG_VERSION.run

diff --git a/software/usr/sbin/wlt_2_comp.py b/software/usr/sbin/wlt_2_comp.py
@@ -383,10 +383,8 @@ def read_maverick():
 sound_on = Config.getboolean('Sound','Beeper_enabled')
 sound_on_start = Config.getboolean('Sound','beeper_on_start')
 
-#Einlesen der Software-Version
-command = 'cat /var/www/header.php | grep \'] = "V\' | cut -c31-38'
-
-build = os.popen(command).read()
+# Software-Version, wird beim build gesetzt
+build = 'XXX_VERSION_XXX'
 
 #Einlesen der Logging-Option
 newfile = Config.getboolean('Logging','write_new_log_on_restart')