From d0687aed8021f1c9cccf28ff7fd94ccd4e95b729 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 4 Feb 2022 02:50:39 +0100 Subject: [PATCH] Apply last example_ynh --- conf/systemd.service | 2 +- doc/DESCRIPTION.md | 2 +- manifest.json | 2 +- scripts/install | 4 ++-- scripts/restore | 6 +++--- scripts/upgrade | 3 ++- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 2feee3a..69dd552 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -15,7 +15,7 @@ Group=__APP__ #PAMName=login # you might want to try this one, did not work on all systems ExecStart=/usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/bin/kodi -- :0 -nolisten tcp vt7 Restart=on-abort -RestartSec = 5 +RestartSec=5 [Install] WantedBy=multi-user.target diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index e7521a0..ce0274c 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1 +1 @@ -Kodi is a media center and entertainment hub that brings all your digital media together. It is 100% free and open source, very customisable and runs on a wide variety of devices. Users can play and view most videos, music, podcasts, games and other digital media files from local and network storage media and the internet. \ No newline at end of file +Kodi is a media center and entertainment hub that brings all your digital media together. It is 100% free and open source, very customisable and runs on a wide variety of devices. Users can play and view most videos, music, podcasts, games and other digital media files from local and network storage media and the internet. diff --git a/manifest.json b/manifest.json index 45a94f5..ab1f7bf 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Media center that brings all your digital media together", "fr": "Centre multimédia qui rassemble tous vos médias numériques" }, - "version": "17.3~ynh1", + "version": "19.1~ynh1", "url": "https://kodi.tv", "upstream": { "license": "GPL-2.0", diff --git a/scripts/install b/scripts/install index 65a7fa5..445936d 100644 --- a/scripts/install +++ b/scripts/install @@ -69,7 +69,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port # If you do this and the app doesn't actually need you are CREATING SECURITY HOLES IN THE SERVER !) # Open the port -# ynh_script_progression --message="Configuring firewall..." +ynh_script_progression --message="Configuring firewall..." if [ "$open_webserver_port" -eq 1 ] then ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port @@ -104,7 +104,7 @@ fi ynh_script_progression --message="Configuring system user..." # Create a system user -ynh_system_user_create --username=$app --home_dir=$final_path +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # NGINX CONFIGURATION diff --git a/scripts/restore b/scripts/restore index 7d2e195..b194217 100644 --- a/scripts/restore +++ b/scripts/restore @@ -37,10 +37,10 @@ port=$(ynh_app_setting_get --app=$app --key=port) #================================================= # FIND AND OPEN A PORT #================================================= -ynh_script_progression --message="Finding an available port..." +# ynh_script_progression --message="Finding an available port..." # Open the port -# ynh_script_progression --message="Configuring firewall..." +ynh_script_progression --message="Configuring firewall..." if [ "$open_webserver_port" -eq 1 ] then ynh_exec_warn_less yunohost firewall allow --no-upnp TCP $port @@ -69,7 +69,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_script_progression --message="Recreating the dedicated system user..." # Create the dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir=$final_path +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # RESTORE THE APP MAIN DIR diff --git a/scripts/upgrade b/scripts/upgrade index 906561a..fe3b8ac 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -26,6 +26,7 @@ port=$(ynh_app_setting_get --app=$app --key=port) #================================================= # CHECK VERSION #================================================= +ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) @@ -88,7 +89,7 @@ fi ynh_script_progression --message="Making sure dedicated system user exists..." # Create a dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir=$final_path +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # NGINX CONFIGURATION