From b6468a3f734d598e9b17d50ce243bf65904d8ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 28 Dec 2022 22:45:49 +0100 Subject: [PATCH] Fix --- check_process | 2 +- doc/DESCRIPTION.md | 12 ++++++------ manifest.json | 8 ++++---- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 46 ++-------------------------------------------- 6 files changed, 15 insertions(+), 57 deletions(-) diff --git a/check_process b/check_process index 951eb70..d188b08 100644 --- a/check_process +++ b/check_process @@ -6,7 +6,7 @@ port="666" ; Checks pkg_linter=1 - setup_sub_dir=1 + setup_sub_dir=0 setup_root=1 setup_nourl=0 setup_private=1 diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 8b8f71e..7959333 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -3,9 +3,9 @@ It integrates with the services you use to display information on the homepage ( ###Features - Integrates with services you use. - Search the web directly from your homepage. - Real-time status indicator for every service. - Automatically finds icons while you type the name of a service. - Widgets that can display all types of information. - Very light-weight and fast. +- Integrates with services you use. +- Search the web directly from your homepage. +- Real-time status indicator for every service. +- Automatically finds icons while you type the name of a service. +- Widgets that can display all types of information. +- Very light-weight and fast. diff --git a/manifest.json b/manifest.json index 074498e..ba9add5 100644 --- a/manifest.json +++ b/manifest.json @@ -4,16 +4,16 @@ "packaging_format": 1, "description": { "en": "Customizable browser's home page to interact with your homeserver's Docker containers", - "fr": "Customizable browser's home page to interact with your homeserver's Docker containers" + "fr": "Page d'accueil personnalisable pour interagir avec les conteneurs Docker de votre serveur" }, "version": "0.10.7~ynh1", "url": "https://homarr.dev/", "upstream": { "license": "MIT", "website": "https://homarr.dev/", - "demo": "https://demo.example.com", - "admindoc": "https://yunohost.org/packaging_apps", - "userdoc": "https://yunohost.org/apps", + "demo": "https://homarr.ajnart.fr/fr", + "admindoc": "https://homarr.dev/docs/about", + "userdoc": "https://homarr.dev/docs/about", "code": "https://github.com/ajnart/homarr" }, "license": "MIT", diff --git a/scripts/install b/scripts/install index 16263b8..2ad7834 100755 --- a/scripts/install +++ b/scripts/install @@ -125,7 +125,7 @@ ynh_add_systemd_config #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Customizable browser's home page" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index a9f21e9..ed5a1ed 100755 --- a/scripts/restore +++ b/scripts/restore @@ -94,7 +94,7 @@ systemctl enable $app.service --quiet #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Customizable browser's home page" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index c86e8ac..73040ea 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -49,49 +49,6 @@ ynh_script_progression --message="Stopping a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - -# -# N.B. : the followings setting migrations snippets are provided as *EXAMPLES* -# of what you may want to do in some cases (e.g. a setting was not defined on -# some legacy installs and you therefore want to initiaze stuff during upgrade) -# - -# If db_name doesn't exist, create it -#if [ -z "$db_name" ]; then -# db_name=$(ynh_sanitize_dbid --db_name=$app) -# ynh_app_setting_set --app=$app --key=db_name --value=$db_name -#fi - -# If final_path doesn't exist, create it -#if [ -z "$final_path" ]; then -# final_path=/var/www/$app -# ynh_app_setting_set --app=$app --key=final_path --value=$final_path -#fi - -### If nobody installed your app before 4.1, -### then you may safely remove these lines - -# Cleaning legacy permissions -if ynh_legacy_permissions_exists; then - ynh_legacy_permissions_delete_all - - ynh_app_setting_delete --app=$app --key=is_public -fi - -if ! ynh_permission_exists --permission="admin"; then - # Create the required permissions - ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin -fi - -# Create a permission if needed -if ! ynh_permission_exists --permission="api"; then - ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --show_tile="false" --protected="true" -fi - #================================================= # CREATE DEDICATED USER #================================================= @@ -140,6 +97,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 +env_path="$PATH" # Create a dedicated systemd config ynh_add_systemd_config @@ -148,7 +106,7 @@ ynh_add_systemd_config #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log" +yunohost service add $app --description="Customizable browser's home page" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE