From a1574db6456708d049664a1767e00bbc59904cf1 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 17 Jul 2022 04:18:27 +0200 Subject: [PATCH 1/3] Fix linter --- check_process | 2 ++ manifest.json | 2 +- scripts/install | 11 ++++------- scripts/restore | 6 +++--- scripts/upgrade | 6 +++--- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/check_process b/check_process index 74cea60..d3b3911 100644 --- a/check_process +++ b/check_process @@ -16,6 +16,8 @@ upgrade=1 from_commit=7c7a55f99f8a593078fc37d2200bd6ca86766233 # 3.3.45~ynh2 upgrade=1 from_commit=4067b16fa1ef2c15247089852a5aca3249bf466a + # 4.1.19~ynh1 + upgrade=1 from_commit=bbf6b7145f37b4e918d80d3293628970fc0acb51 backup_restore=1 multi_instance=0 port_already_use=0 diff --git a/manifest.json b/manifest.json index 9784c59..fbdc768 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Home automation application", "fr": "Application de domotique" }, - "version": "4.1.19~ynh1", + "version": "4.1.19~ynh2", "url": "https://www.jeedom.com", "upstream": { "license": "GPL-2.0-or-later", diff --git a/scripts/install b/scripts/install index 140b608..3d957de 100644 --- a/scripts/install +++ b/scripts/install @@ -49,7 +49,7 @@ ynh_script_progression --message="Storing installation settings..." ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin -ynh_app_setting_set --app=$app --key=sudo --value=$sudo +ynh_app_setting_set --app=$app --key="sudo" --value=$sudo #================================================= # STANDARD MODIFICATIONS @@ -59,7 +59,7 @@ ynh_app_setting_set --app=$app --key=sudo --value=$sudo ynh_script_progression --message="Installing dependencies..." ynh_install_app_dependencies $pkg_dependencies -ynh_install_extra_app_dependencies --repo="deb http://deb.debian.org/debian $(lsb_release --codename --short) contrib non-free" --package="$extra_pkg_dependencies" +ynh_install_extra_app_dependencies --repo="deb http://deb.debian.org/debian $(lsb_release --codename --short) contrib non-free" --package="$extra_pkg_dependencies" --key="https://ftp-master.debian.org/keys/release-$(lsb_release --release --short).asc" #================================================= # CREATE DEDICATED USER @@ -133,8 +133,8 @@ if [ $(getent group tty) ]; then fi # Sudo permissions to the user if agreed to -if [ $sudo ]; then - usermod -a -G sudo www-data +if [ ${sudo} ]; then + usermod -a -G "sudo" www-data if [ $(grep "www-data ALL=(ALL) NOPASSWD: ALL" /etc/sudoers | wc -l) -eq 0 ];then bash -c 'echo "www-data ALL=(ALL) NOPASSWD: ALL" | (EDITOR="tee -a" visudo)' fi @@ -166,9 +166,6 @@ php$phpversion $final_path/install/install.php mode=force ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="../conf/config.sql" ynh_mysql_execute_file_as_root --file="../conf/config.sql" --database=$db_name -# Check -#sudo php $final_path/install/sick.php - #================================================= # SECURE FILES AND DIRECTORIES #================================================= diff --git a/scripts/restore b/scripts/restore index b8ecbda..039acdc 100644 --- a/scripts/restore +++ b/scripts/restore @@ -73,7 +73,7 @@ ynh_script_progression --message="Reinstalling dependencies..." # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies -ynh_install_extra_app_dependencies --repo="deb http://deb.debian.org/debian $(lsb_release --codename --short) contrib non-free" --package="$extra_pkg_dependencies" +ynh_install_extra_app_dependencies --repo="deb http://deb.debian.org/debian $(lsb_release --codename --short) contrib non-free" --package="$extra_pkg_dependencies" --key="https://ftp-master.debian.org/keys/release-$(lsb_release --release --short).asc" #================================================= # RESTORE THE PHP-FPM CONFIGURATION @@ -111,8 +111,8 @@ if [ $(getent group tty) ]; then fi # Sudo permissions to the user if agreed to -if [ $sudo ]; then - usermod -a -G sudo www-data +if [ ${sudo} ]; then + usermod -a -G "sudo" www-data if [ $(grep "www-data ALL=(ALL) NOPASSWD: ALL" /etc/sudoers | wc -l) -eq 0 ];then bash -c 'echo "www-data ALL=(ALL) NOPASSWD: ALL" | (EDITOR="tee -a" visudo)' fi diff --git a/scripts/upgrade b/scripts/upgrade index 9d3d794..ba8162a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -95,7 +95,7 @@ chown -R $app:www-data "$final_path" ynh_script_progression --message="Upgrading dependencies..." ynh_install_app_dependencies $pkg_dependencies -ynh_install_extra_app_dependencies --repo="deb http://deb.debian.org/debian $(lsb_release --codename --short) contrib non-free" --package="$extra_pkg_dependencies" +ynh_install_extra_app_dependencies --repo="deb http://deb.debian.org/debian $(lsb_release --codename --short) contrib non-free" --package="$extra_pkg_dependencies" --key="https://ftp-master.debian.org/keys/release-$(lsb_release --release --short).asc" #================================================= # PHP-FPM CONFIGURATION @@ -138,8 +138,8 @@ if [ $(getent group tty) ]; then fi # Sudo permissions to the user if agreed to -if [ $sudo ]; then - usermod -a -G sudo www-data +if [ ${sudo} ]; then + usermod -a -G "sudo" www-data if [ $(grep "www-data ALL=(ALL) NOPASSWD: ALL" /etc/sudoers | wc -l) -eq 0 ];then bash -c 'echo "www-data ALL=(ALL) NOPASSWD: ALL" | (EDITOR="tee -a" visudo)' fi From af5cc890fc3c358cdf786744fa94d1f375a27566 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 17 Jul 2022 02:18:32 +0000 Subject: [PATCH 2/3] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b70c7a9..3125a3b 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Jeedom is an home automation software. -**Shipped version:** 4.1.19~ynh1 +**Shipped version:** 4.1.19~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index ceeead4..47901f0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Jeedom is an home automation software. -**Version incluse :** 4.1.19~ynh1 +**Version incluse :** 4.1.19~ynh2 ## Captures d'écran From 4c9d9b02456d69ba229b00c9fcbbd0be0e28516a Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 18 Jul 2022 20:22:25 +0200 Subject: [PATCH 3/3] Update manifest.json --- manifest.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index fbdc768..2e6dfbe 100644 --- a/manifest.json +++ b/manifest.json @@ -16,8 +16,7 @@ }, "license": "GPL-2.0-or-later", "maintainer": { - "name": "scith", - "url": "https://github.com/scith" + "name": "" }, "requirements": { "yunohost": ">= 4.3.0"