Cleaning up

README.md

@@ -1,15 +1,15 @@
 # Lychee for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/lychee.svg)](https://dash.yunohost.org/appci/app/lychee) ![](https://ci-apps.yunohost.org/ci/badges/lychee.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/lychee.maintain.svg)  
-[![Install lychee with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=lychee)
+[![Install Lychee with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=lychee)
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install Encryptic quickly and simply on a YunoHost server.  
+> *This package allows you to install Lychee quickly and simply on a YunoHost server.  
 If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
-Lychee is a free photo-management tool, which runs on your server or web-space. Installing is a matter of seconds. Upload, manage and share photos like from a native application. Lychee comes with everything you need and all your photos are stored securely. Read more on our website.
+Lychee is a free photo-management tool, which runs on your server or web-space. Installing is a matter of seconds. Upload, manage and share photos like from a native application. Lychee comes with everything you need and all your photos are stored securely.
 
 **Shipped version:** 4.0.7
 
@@ -23,12 +23,12 @@ Lychee is a free photo-management tool, which runs on your server or web-space.
 
 ## Configuration
 
-How to configure this app: From an admin panel, a plain file with SSH, or any other way.
+How to configure this app: From an admin panel.
 
 ## Documentation
 
  * Official documentation: https://lycheeorg.github.io/docs/
- * YunoHost documentation: If specific documentation is needed, feel free to contribute.
+ * YunoHost documentation: https://yunohost.org/#/app_lychee
 
 ## YunoHost specific features
 
@@ -52,7 +52,7 @@ How to configure this app: From an admin panel, a plain file with SSH, or any ot
 
 ## Links
 
- * Report a bug: https://github.com/YunoHost-Apps/encryptic_ynh/issues
+ * Report a bug: https://github.com/YunoHost-Apps/lychee_ynh/issues
  * App website: https://lycheeorg.github.io/
  * Upstream app repository: https://github.com/LycheeOrg/Lychee
  * YunoHost website: https://yunohost.org/

README_fr.md

@@ -28,7 +28,7 @@ Comment configurer cette application : via le panneau d'administration.
 ## Documentation
 
  * Documentation officielle : https://lycheeorg.github.io/docs/
- * Documentation YunoHost : Si une documentation spécifique est nécessaire, n'hésitez pas à contribuer.
+ * Documentation YunoHost : https://yunohost.org/#/app_lychee_fr
 
 ## Caractéristiques spécifiques YunoHost
 

scripts/backup

@@ -35,7 +35,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 ynh_backup --src_path="$final_path"
 
 #=================================================
-# BACKUP MEDIA
+# BACKUP MEDIA FOLDER
 #=================================================
 
 #ynh_backup --src_path="/home/yunohost.$app" --is_big

scripts/install

@@ -99,7 +99,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 # INSTALL LYCHEE WITH COMPOSER
 #=================================================
-ynh_script_progression --message="Installing Lychee with Composer..." --weight=45
+ynh_script_progression --message="Installing Lychee with Composer..." --weight=15
 
 # Install composer
 ynh_install_composer --phpversion="${YNH_PHP_VERSION}" --workdir="$final_path" --install_args="--prefer-source --no-dev"
@@ -109,7 +109,7 @@ ynh_install_composer --phpversion="${YNH_PHP_VERSION}" --workdir="$final_path" -
 #=================================================
 ynh_script_progression --message="Building..."
 
-# setup application config
+# Setup application config
 cp ../conf/.env.example $final_path/.env
 
 ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/.env"

scripts/remove

@@ -34,7 +34,7 @@ ynh_secure_remove --file="$final_path"
 #=================================================
 # REMOVE THE MYSQL DATABASE
 #=================================================
-ynh_script_progression --message="Removing the MySQL database..."
+ynh_script_progression --message="Removing the MySQL database..." --weight=2
 
 # Remove a database if it exists, along with the associated user
 ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
@@ -50,7 +50,7 @@ ynh_remove_nginx_config
 #=================================================
 # REMOVE PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing PHP-FPM configuration..."
+ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=2
 
 # Remove the dedicated PHP-FPM config
 ynh_remove_fpm_config
@@ -60,7 +60,7 @@ ynh_remove_fpm_config
 #=================================================
 # REMOVE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Removing the dedicated system user..."
+ynh_script_progression --message="Removing the dedicated system user..." --weight=1
 
 # Delete a system user
 ynh_system_user_delete --username=$app

scripts/restore

@@ -76,7 +76,7 @@ ynh_system_user_create --username=$app
 
 # Restore permissions on app files
 chown -R $app: $final_path
-chmod -R 750 /home/yunohost.$app/{uploads,data}
+#chmod -R 750 /home/yunohost.$app/{uploads,data}
 
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
@@ -103,12 +103,11 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./
 #=================================================
 # RELOAD NGINX AND PHP-FPM
 #=================================================
-ynh_script_progression --message="Reloading nginx web server and php-fpm..."
+ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..."
 
 ynh_systemd_action --service_name=php$phpversion-fpm --action=reload
 ynh_systemd_action --service_name=nginx --action=reload
 
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/upgrade

@@ -117,9 +117,9 @@ ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependenc
 #=================================================
 # INSTALL AND INITIALIZE COMPOSER
 #=================================================
-ynh_script_progression --message="Installing Composer..."
+ynh_script_progression --message="Installing Composer..." --weight=10
 
-# Install composer
+# Install Composer
 ynh_install_composer
 
 ynh_exec_warn_less ynh_composer_exec --commands=\"dump-autoload\"