From 574d6ea90dd6716dedfa6c832d1315dbb5c041d7 Mon Sep 17 00:00:00 2001
From: Sylvain <syl@thinkpad.localhost>
Date: Fri, 8 Mar 2024 12:37:54 +0100
Subject: [PATCH] Refractor updater.sh and _common.sh

---
 .github/workflows/updater.sh | 22 ----------------------
 scripts/_common.sh           | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh
index ab7938d..94c7567 100644
--- a/.github/workflows/updater.sh
+++ b/.github/workflows/updater.sh
@@ -40,28 +40,6 @@ then
 	exit 0
 fi
 
-#=================================================
-# SPECIFIC UPDATE STEPS
-#=================================================
-
-# Replace new version in _common.sh
-sed -i "s/^app_version=.*/app_version=$upstream_version/" scripts/_common.sh
-
-# Replace python required version
-py_required_major=$(curl -Ls https://pypi.org/pypi/$app/json | jq -r .info.requires_python | cut -d '=' -f 2 | rev | cut -d"." -f2-  | rev)
-py_required_minor=$(curl -s "https://www.python.org/ftp/python/" | grep ">$py_required_major"  | cut -d '/' -f 2 | cut -d '>' -f 2 | sort -rV | head -n 1)
-current_py_required_minor=$(cat scripts/_common.sh | grep "py_required_version=" | cut -d '=' -f 2)
-if ! dpkg --compare-versions "$current_py_required_minor" "lt" "$py_required_minor"
-then
-	echo "::warning :: No need to update required python version"
-else
-	echo "::warning :: Updating required python version to new upstream python version"
-	sed -i "s/^py_required_version=.*/py_required_version=$py_required_minor/" scripts/_common.sh
-fi
-# Replace pip required version
-pip_required=$(curl -Ls https://pypi.org/pypi/$app/json | jq -r .info.requires_dist[] | grep "pip") #"pip (<23.1,>=21.0)"
-sed -i "s/^pip_required=.*/pip_required=\"$pip_required\"/" scripts/_common.sh
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 15e7793..7d9883d 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,12 +4,14 @@
 # COMMON VARIABLES
 #=================================================
 
-# Release to install
-app_version=2024.2.5
+# App version
+## yq is not a dependencie of yunohost package so tomlq command is not available (see https://github.com/YunoHost/yunohost/blob/dev/debian/control)
+app_version=$(cat ../manifest.toml | grep 'version = '| cut -d '=' -f 2 | cut -d '~' -f 1 | tr -d ' "') #2024.2.5
 
-# Requirements
-py_required_version=3.11.8
-pip_required="pip (>=21.3.1)"
+# Python required version
+## jq is a dependencie of yunohost package (see https://github.com/YunoHost/yunohost/blob/dev/debian/control)
+py_required_major=$(curl -Ls https://pypi.org/pypi/$app/$app_version/json | jq -r '.info.requires_python' | cut -d '=' -f 2 | rev | cut -d '.' -f2-  | rev) #3.11
+py_required_version=$(curl -Ls https://www.python.org/ftp/python/ | grep '>'$py_required_major  | cut -d '/' -f 2 | cut -d '>' -f 2 | sort -rV | head -n 1) #3.11.8
 
 # Fail2ban
 failregex="^%(__prefix_line)s.*\[homeassistant.components.http.ban\] Login attempt or request with invalid authentication from.* \(<HOST>\).* Requested URL: ./auth/.*"
@@ -113,6 +115,9 @@ myynh_install_python () {
 	
 # Install/Upgrade Homeassistant in virtual environement
 myynh_install_homeassistant () {
+	# Requirements
+	pip_required=$(curl -Ls https://pypi.org/pypi/$app/$app_version/json | jq -r '.info.requires_dist[]' | grep 'pip') #pip (<23.1,>=21.0)
+
 	# Create the virtual environment
 	ynh_exec_as $app $py_app_version -m venv --without-pip "$install_dir"