mirror of
https://github.com/YunoHost-Apps/friendica_ynh.git
synced 2024-09-03 18:36:14 +02:00
upgrade: use new commit variables
This commit is contained in:
parent
f885545d56
commit
573615287b
1 changed files with 4 additions and 4 deletions
|
@ -101,12 +101,12 @@ then
|
|||
# Update through git
|
||||
pushd "$final_path"
|
||||
git fetch
|
||||
git checkout stable
|
||||
git checkout stable $version_commit
|
||||
git pull
|
||||
popd
|
||||
pushd "$final_path/addon"
|
||||
git fetch
|
||||
git checkout stable
|
||||
git checkout stable $addons_version_commit
|
||||
git pull
|
||||
popd
|
||||
# If git is not present upgrade through manual method
|
||||
|
@ -124,7 +124,7 @@ else
|
|||
# 1 - Clone stable repo
|
||||
git clone https://github.com/friendica/friendica.git -b stable "$final_path"
|
||||
# Reset branch to the level of update we needed
|
||||
git reset --hard $update_commit
|
||||
git reset --hard $version_commit
|
||||
|
||||
# Remove the addon directory securely
|
||||
ynh_secure_remove "$final_path/addon"
|
||||
|
@ -132,7 +132,7 @@ else
|
|||
# 2 - Clone addons repo
|
||||
git clone https://github.com/friendica/friendica-addons.git -b stable "$final_path/addon"
|
||||
# Reset addons branch to the level of update we needed
|
||||
git reset --hard $addons_update_commit
|
||||
git reset --hard $addons_version_commit
|
||||
|
||||
# Restore the smarty3 folder
|
||||
cp -a "$tmpdir/view/smarty3" "$final_path/view/smarty3"
|
||||
|
|
Loading…
Reference in a new issue