YunoHost-Apps/homeassistant_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/homeassistant_ynh.git synced 2024-09-03 19:26:16 +02:00
Code Issues Activity Actions

Refractor updater.sh and _common.sh

Browse source
This commit is contained in:
Sylvain 2024-03-08 12:37:54 +01:00
parent efafe71fe4
commit 574d6ea90d
2 changed files with 10 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
.github/workflows/updater.sh vendored
View file

@ -40,28 +40,6 @@ then
exit 0 exit 0
fi 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 # GENERIC FINALIZATION
#================================================= #=================================================

15
scripts/_common.sh
View file

@ -4,12 +4,14 @@
# COMMON VARIABLES # COMMON VARIABLES
#================================================= #=================================================
# Release to install # App version
app_version=2024.2.5 ## 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 # Python required version
py_required_version=3.11.8 ## jq is a dependencie of yunohost package (see https://github.com/YunoHost/yunohost/blob/dev/debian/control)
pip_required="pip (>=21.3.1)" 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 # Fail2ban
failregex="^%(__prefix_line)s.*\[homeassistant.components.http.ban\] Login attempt or request with invalid authentication from.* \(<HOST>\).* Requested URL: ./auth/.*" 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 # Install/Upgrade Homeassistant in virtual environement
myynh_install_homeassistant () { 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 # Create the virtual environment
ynh_exec_as $app $py_app_version -m venv --without-pip "$install_dir" ynh_exec_as $app $py_app_version -m venv --without-pip "$install_dir"