From 8ebc34ffa13a25c9169681f0ca600d9bdb36e2e9 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Tue, 29 Mar 2022 09:59:44 +0200
Subject: [PATCH] Fix

---
 check_process   | 27 +++++++++++++++++++++++++++
 scripts/install | 16 ++++------------
 2 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 check_process

diff --git a/check_process b/check_process
new file mode 100644
index 0000000..9f8650a
--- /dev/null
+++ b/check_process
@@ -0,0 +1,27 @@
+;; Test complet
+	; Manifest
+		domain="domain.tld"
+		path="/path"
+		is_public=1
+		language="fr"
+		admin="john"
+		password="1Strong-Password"
+	; Checks
+		pkg_linter=1
+		setup_sub_dir=1
+		setup_root=1
+		setup_nourl=0
+		setup_private=1
+		setup_public=1
+		upgrade=1
+		#upgrade=1	from_commit=CommitHash
+		backup_restore=1
+		multi_instance=1
+		change_url=1
+;;; Options
+Email=
+Notification=none
+;;; Upgrade options
+	; commit=CommitHash
+		name=Name and date of the commit.
+		manifest_arg=domain=DOMAIN&path=PATH&is_public=1&language=fr&admin=USER&password=pass&port=666&
diff --git a/scripts/install b/scripts/install
index 79d8a0e..feef535 100644
--- a/scripts/install
+++ b/scripts/install
@@ -33,7 +33,7 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
-ynh_script_progression --message="Validating installation parameters..." --time --weight=1
+ynh_script_progression --message="Validating installation parameters..." --weight=1
 
 final_path=/var/www/$app
 test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
@@ -44,7 +44,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 #=================================================
 # STORE SETTINGS FROM MANIFEST
 #=================================================
-ynh_script_progression --message="Storing installation settings..." --time --weight=1
+ynh_script_progression --message="Storing installation settings..." --weight=1
 
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
@@ -66,6 +66,8 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$final_path"
 
+mkdir "$final_path/db"
+
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
@@ -93,16 +95,6 @@ ynh_script_progression --message="Installing $app with Composer..." --weight=15
 
 ynh_install_composer 
 
-#=================================================
-# INSTALL LYCHEE WITH COMPOSER
-#=================================================
-ynh_script_progression --message="Installing $app with Composer..." --weight=15
-
-pushd $final_path
-	./composer.phar install
-	mkdir db
-popd
-
 #=================================================
 # SETUP SSOWAT
 #=================================================