YunoHost-Apps/friendica_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/friendica_ynh.git synced 2024-09-03 18:36:14 +02:00
Code Issues Activity Actions

fix

Browse source
This commit is contained in:
Éric Gaspar 2023-08-21 12:48:38 +02:00
parent 98a3c58e88
commit 2a318c2943
3 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
check_process
View file

@ -11,7 +11,8 @@
setup_private=0 setup_private=0
setup_public=1 setup_public=1
upgrade=1 upgrade=1
upgrade=1 from_commit=41c39d47e4e398339b7d6a4167ca2198dae998e3 #2023.01~ynh1
upgrade=1 from_commit=dc7cd3eabe212708375c0dcd4ee994a1373a8122
backup_restore=1 backup_restore=1
multi_instance=1 multi_instance=1
change_url=1 change_url=1
@ -20,5 +21,5 @@ Email=
Notification=none Notification=none
;;; Upgrade options ;;; Upgrade options
; commit=41c39d47e4e398339b7d6a4167ca2198dae998e3 ; 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& manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&

3
scripts/install
View file

@ -94,9 +94,6 @@ pushd "$final_path"
git reset --hard --quiet $version_commit git reset --hard --quiet $version_commit
popd popd
# Copy .htaccess-dist to ..htaccess
cp -f "$final_path/.htaccess-dist" "$final_path/.htaccess"
# 2 - Clone addons repo # 2 - Clone addons repo
git clone --quiet https://github.com/friendica/friendica-addons.git -b stable "$final_path/addon" 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 # Reset addons branch to the level of update we needed

9
scripts/upgrade
View file

@ -65,15 +65,6 @@ if [ -z "$final_path" ]; then
ynh_app_setting_set --app=$app --key=final_path --value=$final_path ynh_app_setting_set --app=$app --key=final_path --value=$final_path
fi 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 admin_mail setting doesn't exist, create it
if [ -z $email ]; then if [ -z $email ]; then
email=$(ynh_user_get_info --username=$admin --key=mail) email=$(ynh_user_get_info --username=$admin --key=mail)