1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/friendica_ynh.git synced 2024-09-03 18:36:14 +02:00
This commit is contained in:
ericgaspar 2021-07-19 10:13:44 +02:00
parent 52424cd9bb
commit 6116dd46d8
No known key found for this signature in database
GPG key ID: 574F281483054D44
2 changed files with 9 additions and 9 deletions

View file

@ -80,7 +80,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 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"
git reset --hard $version_commit git reset --hard $version_commit
@ -90,10 +90,10 @@ popd
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 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
pushd "$final_path/addon" pushd "$final_path/addon"
git reset --hard $addons_version_commit git reset --hard --quiet $addons_version_commit
popd popd
chmod 750 "$final_path" chmod 750 "$final_path"

View file

@ -129,25 +129,25 @@ else
cp -a "$final_path/view/smarty3" "$tmpdir/smarty3" cp -a "$final_path/view/smarty3" "$tmpdir/smarty3"
# Remove the app directory securely # Remove the app directory securely
ynh_secure_remove "$final_path" ynh_secure_remove --file="$final_path"
# 1 - Clone stable repo # 1 - Clone stable repo
git clone 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"
git reset --hard $version_commit git reset --hard --quiet $version_commit
popd popd
# 2 - Clone addons repo # 2 - Clone addons repo
git clone 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
pushd "$final_path/addon" pushd "$final_path/addon"
git reset --hard $addons_version_commit git reset --hard --quiet $addons_version_commit
popd popd
# Restore the smarty3 folder # Restore the smarty3 folder
cp -a "$tmpdir/smarty3" "$final_path/view/smarty3" cp -a "$tmpdir/smarty3" "$final_path/view/smarty3"
ynh_secure_remove "$tmpdir" ynh_secure_remove --file="$tmpdir"
fi fi
fi fi