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

Merge branch 'master' into testing

This commit is contained in:
Éric Gaspar 2021-07-18 00:06:55 +02:00 committed by GitHub
commit b4f3a5af25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -125,20 +125,20 @@ else
ynh_script_progression --message="Upgrading source files..." ynh_script_progression --message="Upgrading source files..."
cp -a "$final_path/view/smarty3" "$tmpdir/view/smarty3" cp -a "$final_path/view/smarty3" "$tmpdir/view/smarty3"
# Remove the app directory securely # Remove the app directory securely
ynh_secure_remove "$final_path" ynh_secure_remove "$final_path"
# 1- Clone stable repo # 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"
# Remove the addon directory securely # Remove the addon directory securely
ynh_secure_remove "$final_path/addon" ynh_secure_remove "$final_path/addon"
# 2 - Clone addons repo # 2 - Clone addons repo
git clone https://github.com/friendica/friendica-addons.git -b stable "$final_path/addon" git clone https://github.com/friendica/friendica-addons.git -b stable "$final_path/addon"
# Restore the smarty3 folder # Restore the smarty3 folder
cp -a "$tmpdir/view/smarty3" "${final_path}" cp -a "$tmpdir/view/smarty3" "${final_path}"
ynh_secure_remove "$tmpdir" ynh_secure_remove "$tmpdir"
fi fi
fi fi