mirror of
https://github.com/YunoHost-Apps/friendica_ynh.git
synced 2024-09-03 18:36:14 +02:00
Merge branch 'testing' into 2022.10
This commit is contained in:
commit
10344307c3
1 changed files with 3 additions and 3 deletions
|
@ -87,7 +87,7 @@ ynh_script_progression --message="Setting up source files..." --weight=5
|
||||||
|
|
||||||
ynh_app_setting_set --app=$app --key=final_path --value=$final_path
|
ynh_app_setting_set --app=$app --key=final_path --value=$final_path
|
||||||
|
|
||||||
# 1 - Clone stable repo
|
# 1 - Clone stable repo
|
||||||
git clone --quiet https://github.com/friendica/friendica.git -b stable "$final_path"
|
git clone --quiet https://github.com/friendica/friendica.git -b stable "$final_path"
|
||||||
# Reset branch to the level of update we needed
|
# Reset branch to the level of update we needed
|
||||||
pushd "$final_path"
|
pushd "$final_path"
|
||||||
|
@ -97,8 +97,8 @@ popd
|
||||||
# Copy .htaccess-dist to ..htaccess
|
# Copy .htaccess-dist to ..htaccess
|
||||||
cp -f "$final_path/.htaccess-dist" "$final_path/.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 develop "$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
|
||||||
pushd "$final_path/addon"
|
pushd "$final_path/addon"
|
||||||
git reset --hard --quiet $addons_version_commit
|
git reset --hard --quiet $addons_version_commit
|
||||||
|
|
Loading…
Reference in a new issue