From f9d1bfccbdd0ebe6f4f7afe0e8ce2b8280ac1d66 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 15 Jan 2021 11:33:11 +0100 Subject: [PATCH] fix --- scripts/install | 12 ++++++------ scripts/restore | 2 +- scripts/upgrade | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/install b/scripts/install index c962c8a..1ff4524 100644 --- a/scripts/install +++ b/scripts/install @@ -139,10 +139,10 @@ ynh_store_file_checksum --file="$final_path/config/db.inc.php" # Install PHP dependencies using composer #================================================= -pushd "$final_path" +pushd $final_path export COMPOSER_HOME=$final_path ynh_exec_warn_less curl -sS https://getcomposer.org/installer | php${phpversion} -- --version="1.10.16" --install-dir="$final_path" \ - && php${phpversion} composer.phar install --no-interaction + && php${phpversion} composer.phar install --no-interaction --quiet popd #================================================= @@ -168,9 +168,9 @@ cache_dir="/home/$app" mkdir -p $cache_dir chown -R $app $cache_dir -pushd "$final_path" - ynh_exec_as $app php$phpversion composer.phar $app:migrate - ynh_exec_as $app php$phpversion daemon.php config --username=$admin --password=$password +pushd $final_path + ynh_exec_as $app php$phpversion composer.phar $app:migrate --quiet + ynh_exec_as $app php$phpversion daemon.php config --username=$admin --password=$password --quiet popd #================================================= @@ -195,7 +195,7 @@ yunohost service add $app --description="Responsive web-based XMPP client" --log ynh_script_progression --message="Starting a systemd service..." --weight=2 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" #--line_match="HTTP Server listening" +ynh_systemd_action --service_name=$app --action=start --log_path="systemd" #--line_match="HTTP Server listening" #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index da1f97c..1e83f6b 100644 --- a/scripts/restore +++ b/scripts/restore @@ -121,7 +121,7 @@ yunohost service add $app --description="Responsive web-based XMPP client" --log #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=2 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action=start --log_path="/var/log/$app/$app.log" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index b3c6856..24b4872 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -156,8 +156,8 @@ popd #================================================= ynh_script_progression --message="Configuring database.." --weight=1 -pushd "$final_path" - ynh_exec_as $app php$phpversion composer.phar movim:migrate +pushd $final_path + ynh_exec_as $app php$phpversion composer.phar movim:migrate --quiet popd #=================================================