From 14e6863ff005522d8ded25900b621d756c181216 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 29 Mar 2022 10:27:15 +0200
Subject: [PATCH] Fix

---
 conf/nginx.conf    |  2 +-
 doc/DESCRIPTION.md |  2 +-
 scripts/_common.sh |  2 +-
 scripts/install    |  2 +-
 scripts/restore    | 10 ----------
 scripts/upgrade    |  2 +-
 6 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 549b52a..d9fdc4e 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -2,7 +2,7 @@
 location __PATH__/ {
 
   # Path to source
-  alias __FINALPATH__/ ;
+  alias __FINALPATH__/;
 
   index index.php;
 
diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
index 1ef9656..8ad7b8f 100644
--- a/doc/DESCRIPTION.md
+++ b/doc/DESCRIPTION.md
@@ -1 +1 @@
-Simple url shortener script
\ No newline at end of file
+Simple URL shortener script
\ No newline at end of file
diff --git a/scripts/_common.sh b/scripts/_common.sh
index f2d5f4f..a3fbf04 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="7.3"
+YNH_PHP_VERSION="7.4"
 
 # Composer version
 YNH_COMPOSER_VERSION="2.2.9"
diff --git a/scripts/install b/scripts/install
index 4dfc892..e304e09 100644
--- a/scripts/install
+++ b/scripts/install
@@ -60,7 +60,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-ynh_script_progression --message="Setting up source files..." --weight=1
+ynh_script_progression --message="Setting up source files..." --weight=2
 
 ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
diff --git a/scripts/restore b/scripts/restore
index f093630..d64daae 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -76,16 +76,6 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
-#=================================================
-# SPECIFIC RESTORATION
-#=================================================
-# REINSTALL DEPENDENCIES
-#=================================================
-# ynh_script_progression --message="Reinstalling dependencies..." --weight=2
-
-# # Define and install dependencies
-# ynh_install_app_dependencies $pkg_dependencies
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index fe04b44..b64cdf0 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -95,7 +95,7 @@ ynh_add_fpm_config
 #=================================================
 # INSTALL SHURI WITH COMPOSER
 #=================================================
-ynh_script_progression --message="Installing $app with Composer..." --weight=15
+ynh_script_progression --message="Installing $app with Composer..." --weight=3
 
 ynh_install_composer