Merge pull request #198 from YunoHost-Apps/testing

Testing

.github/workflows/updater.sh

@@ -17,10 +17,11 @@
 #=================================================
 
 # Fetching information
-#app=$(cat manifest.json | jq -j '.id')
-#current_version=$(cat manifest.json | jq -j '.version|split("~")[0]')
-app=$(cat manifest.toml | tomlq -j '.id')
-current_version=$(cat manifest.toml | tomlq -j '.version|split("~")[0]')
+#TODO : find a way to install tomlq executable 
+#app=$(cat manifest.toml | tomlq -j '.id')
+#current_version=$(cat manifest.toml | tomlq -j '.version|split("~")[0]')
+app=$(cat manifest.toml | awk -v key="id" '$1 == key { gsub("\"","",$3);print $3 }')
+current_version=$(cat manifest.toml | awk -v key="version" '$1 == key { gsub("\"","",$3);print $3 }' | awk -F'~' '{print $1}')
 upstream_version=$(curl -Ls https://pypi.org/pypi/$app/json | jq -r .info.version)
 
 # Setting up the environment variables
@@ -52,7 +53,9 @@ sed -i "s/^app_version=.*/app_version=$upstream_version/" scripts/_common.sh
 #=================================================
 
 # Replace new version in manifest
-echo "$(tomlq -s --indent 4 ".[] | .version = \"$upstream_version~ynh1\"" manifest.toml)" > manifest.toml
+#TODO : find a way to install tomlq executable 
+#echo "$(tomlq -s --indent 4 ".[] | .version = \"$upstream_version~ynh1\"" manifest.toml)" > manifest.toml
+sed -i "s/^version = .*/version = \"$upstream_version~ynh1\"/" manifest.toml
 
 # No need to update the README, yunohost-bot takes care of it
 

README.md

@@ -29,7 +29,7 @@ Open source home automation that puts local control and privacy first. Powered b
 - Home Energy Management." 
 
 
-**Shipped version:** 2023.2.5~ynh1
+**Shipped version:** 2023.3.1~ynh1
 
 **Demo:** https://demo.home-assistant.io
 

README_fr.md

@@ -29,7 +29,7 @@ Open source home automation that puts local control and privacy first. Powered b
 - Home Energy Management." 
 
 
-**Version incluse :** 2023.2.5~ynh1
+**Version incluse :** 2023.3.1~ynh1
 
 **Démo :** https://demo.home-assistant.io
 

manifest.toml

@@ -5,7 +5,7 @@ name = "Home Assistant"
 description.en = "Home automation platform"
 description.fr = "Plateforme domotique"
 
-version = "2023.2.5~ynh1"
+version = "2023.3.1~ynh1"
 
 maintainers = ["ewilly"]
 
@@ -90,14 +90,14 @@ ram.runtime = "2G"
     owner = "__APP__:rwx"
     group = "__APP__:rx"
     
-    [resources.database]
-    type = "mysql"
-    
     [resources.permissions]
     main.url = "/"
     
-    [resources.apt]
-    packages = "python3, python3-dev, python3-venv, python3-pip, libffi-dev, libssl-dev, libjpeg-dev, zlib1g-dev, autoconf, build-essential, libopenjp2-7, libtiff5, libturbojpeg0, libmariadb-dev, libmariadb-dev-compat, rustc, tk-dev, libncurses5-dev, libncursesw5-dev, libreadline6-dev, libdb5.3-dev, libgdbm-dev, libsqlite3-dev, libbz2-dev, libexpat1-dev, liblzma-dev, wget, tar, libnss3-dev, libreadline-dev"
-    
     [resources.ports]
     main.default = 8123
+    
+    [resources.apt]
+    packages = "mariadb-server python3, python3-dev, python3-venv, python3-pip, libffi-dev, libssl-dev, libjpeg-dev, zlib1g-dev, autoconf, build-essential, libopenjp2-7, libtiff5, libturbojpeg0, libmariadb-dev, libmariadb-dev-compat, rustc, tk-dev, libncurses5-dev, libncursesw5-dev, libreadline6-dev, libdb5.3-dev, libgdbm-dev, libsqlite3-dev, libbz2-dev, libexpat1-dev, liblzma-dev, wget, tar, libnss3-dev, libreadline-dev"
+    
+    [resources.database]
+    type = "mysql"

scripts/_common.sh

@@ -5,7 +5,7 @@
 #=================================================
 
 # Release to install
-app_version=2023.2.5
+app_version=2023.3.1
 
 # Requirements (Major.Minor.Patch)
 # PY_VERSION=$(curl -s "https://www.python.org/ftp/python/" | grep ">3.9" | tail -n1 | cut -d '/' -f 2 | cut -d '>' -f 2)