diff --git a/README.md b/README.md index 71789ea..71db09d 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Home automation platform -**Shipped version:** 2022.2.9~ynh1 +**Shipped version:** 2022.2.9~ynh2 **Demo:** https://demo.home-assistant.io diff --git a/README_fr.md b/README_fr.md index 92c18ff..564cf6c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Plateforme domotique -**Version incluse :** 2022.2.9~ynh1 +**Version incluse :** 2022.2.9~ynh2 **Démo :** https://demo.home-assistant.io diff --git a/manifest.json b/manifest.json index 79a4d7c..c583e82 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Home automation platform", "fr": "Plateforme domotique" }, - "version": "2022.2.9~ynh1", + "version": "2022.2.9~ynh2", "url": "https://github.com/home-assistant/home-assistant", "upstream": { "license": "Apache-2.0", diff --git a/scripts/_common.sh b/scripts/_common.sh index 6c06500..445377b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -41,6 +41,25 @@ myynh_create_dir () { [ -d "$1" ] || mkdir -p "$1" } +myynh_compile_libffi () { + ynh_print_info --message="Building libffi..." + + # Download + wget "https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz" 2>&1 + + # Extract + tar zxf libffi-3.3.tar.gz + + # Install + cd libffi-3.3 + ynh_exec_warn_less ./configure + ynh_exec_warn_less make install + ldconfig + + #Exit + cd .. +} + # Install specific python version # usage: myynh_install_python --python="3.8.6" # | arg: -p, --python= - the python version to install @@ -123,7 +142,7 @@ myynh_install_python () { # Save python version in settings ynh_app_setting_set --app=$app --key=python --value="$python" } - + # Install/Upgrade Homeassistant in virtual environement myynh_install_homeassistant () { ynh_exec_as $app -H -s /bin/bash -c " \ diff --git a/scripts/install b/scripts/install index bcaf8c3..4f2a7bb 100644 --- a/scripts/install +++ b/scripts/install @@ -70,6 +70,10 @@ ynh_app_setting_set --app=$app --key=port --value="$port" ynh_script_progression --message="Installing dependencies..." ynh_install_app_dependencies $pkg_dependencies + +# Install libffi-3.3 if libffi.so.7 is missing (buster) +[[ $(ldconfig -p | grep libffi.so.7) ]] || myynh_compile_libffi + myynh_install_python --python="$py_required_version" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 8e51c99..4c261fa 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -153,6 +153,9 @@ ynh_script_progression --message="Upgrading dependencies..." ynh_install_app_dependencies $pkg_dependencies +# Install libffi-3.3 if libffi.so.7 is missing (buster) +[[ $(ldconfig -p | grep libffi.so.7) ]] || myynh_compile_libffi + #================================================= # UPDATE A CONFIG FILE #=================================================