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

Merge pull request #22 from YunoHost-Apps/upgrade

Browse source 
Fix linter
This commit is contained in:
yalh76 2022-07-18 20:22:35 +02:00 • committed by GitHub
commit 901ba554a7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -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

2
README_fr.md
View file

@ -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

2
check_process
View file

@ -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

5
manifest.json
View file

@ -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",
@ -16,8 +16,7 @@
},
"license": "GPL-2.0-or-later",
"maintainer": {
"name": "scith",
"url": "https://github.com/scith"
"name": ""
},
"requirements": {
"yunohost": ">= 4.3.0"

11
scripts/install
View file

@ -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
#=================================================

6
scripts/restore
View file

@ -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

6
scripts/upgrade
View file

@ -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