diff --git a/check_process b/check_process index 7f2551c..5d1f813 100644 --- a/check_process +++ b/check_process @@ -11,7 +11,8 @@ setup_private=0 setup_public=1 upgrade=1 - upgrade=1 from_commit=41c39d47e4e398339b7d6a4167ca2198dae998e3 + #2023.01~ynh1 + upgrade=1 from_commit=dc7cd3eabe212708375c0dcd4ee994a1373a8122 backup_restore=1 multi_instance=1 change_url=1 @@ -20,5 +21,5 @@ Email= Notification=none ;;; Upgrade options ; commit=41c39d47e4e398339b7d6a4167ca2198dae998e3 - name=Merge pull request #50 from YunoHost-Apps/2021.04 + name=2023.01~ynh1 manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& diff --git a/scripts/install b/scripts/install index 0afa4cd..5aaeadc 100644 --- a/scripts/install +++ b/scripts/install @@ -94,9 +94,6 @@ pushd "$final_path" git reset --hard --quiet $version_commit popd -# Copy .htaccess-dist to ..htaccess -cp -f "$final_path/.htaccess-dist" "$final_path/.htaccess" - # 2 - Clone addons repo git clone --quiet https://github.com/friendica/friendica-addons.git -b stable "$final_path/addon" # Reset addons branch to the level of update we needed diff --git a/scripts/upgrade b/scripts/upgrade index 3cc9e46..7701a6f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -65,15 +65,6 @@ if [ -z "$final_path" ]; then ynh_app_setting_set --app=$app --key=final_path --value=$final_path fi -# Remove files for upgrade compatibilty from previous versions of Friendica -if [ -f $final_path/.htconfig.php ]; then - ynh_secure_remove "$final_path/.htconfig.php" -fi - -if [ -f $final_path/.htconfig.php ]; then - ynh_secure_remove "$final_path/config/local.ini.php" -fi - # If admin_mail setting doesn't exist, create it if [ -z $email ]; then email=$(ynh_user_get_info --username=$admin --key=mail)