diff --git a/check_process b/check_process index 5db0593..d073319 100644 --- a/check_process +++ b/check_process @@ -11,6 +11,7 @@ setup_public=1 upgrade=1 upgrade=1 from_commit=b3642c110f0e927ba36ee32e738a81e6afce958f7ackup_restore=1 + backup_restore=1 multi_instance=1 port_already_use=0 change_url=0 diff --git a/scripts/install b/scripts/install index 0b7abc3..463903b 100644 --- a/scripts/install +++ b/scripts/install @@ -74,7 +74,7 @@ ynh_script_progression --message="Setting up source files..." ynh_app_setting_set --app=$app --key=final_path --value=$final_path # 1- Clone stable repo -$git clone https://github.com/friendica/friendica.git -b stable "$final_path" +git clone https://github.com/friendica/friendica.git -b stable "$final_path" # Copy .htaccess-dist to ..htaccess cp -f "$final_path/.htaccess-dist" "$final_path/.htaccess" @@ -142,7 +142,7 @@ ynh_store_file_checksum --file="$final_path/config/local.config.php" # Run composer pushd "$final_path" - php$phpversion bin/composer.phar install + php$phpversion bin/composer.phar install 2>/dev/null bin/console config system addon ldapauth popd ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" <<< "INSERT INTO addon (id, name, version, installed, hidden, timestamp, plugin_admin) VALUES (NULL, 'ldapauth', '', '1', '0', UNIX_TIMESTAMP(), '0');" diff --git a/scripts/upgrade b/scripts/upgrade index f5bbe95..83e7989 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -131,6 +131,7 @@ else # Restore the smarty3 folder cp -a "$tmpdir/view/smarty3" "${final_path}" + ynh_secure_remove "$tmpdir" fi fi @@ -195,7 +196,7 @@ cp "../conf/poller-cron" "/etc/cron.d/$app" # Run composer pushd "$final_path" - php$phpversion bin/console dbstructure update + php$phpversion bin/console dbstructure update 2> /dev/null bin/console config system addon ldapauth popd