mirror of
https://github.com/YunoHost-Apps/pleroma_ynh.git
synced 2024-09-03 20:15:59 +02:00
Merge branch 'master' into ldap
This commit is contained in:
commit
0ebb6a1664
2 changed files with 1 additions and 2 deletions
|
@ -6,7 +6,7 @@
|
||||||
"en": "Pleroma is an OStatus-compatible social networking server written in Elixir, compatible with GNU Social and Mastodon",
|
"en": "Pleroma is an OStatus-compatible social networking server written in Elixir, compatible with GNU Social and Mastodon",
|
||||||
"fr": "Pleroma est un réseau social écrit en Elixir, compatible avec OStatus, GNU Social et Mastodon"
|
"fr": "Pleroma est un réseau social écrit en Elixir, compatible avec OStatus, GNU Social et Mastodon"
|
||||||
},
|
},
|
||||||
"version": "2.0.2~ynh1",
|
"version": "2.0.2~ynh2",
|
||||||
"url": "https://git.pleroma.social/pleroma/pleroma",
|
"url": "https://git.pleroma.social/pleroma/pleroma",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"maintainer": [
|
"maintainer": [
|
||||||
|
|
|
@ -157,7 +157,6 @@ if ynh_version_gt "1.1.1~ynh1" "${previous_version}" ; then
|
||||||
rsync -a "$final_path/$app/instance/static/" "$datadir/static/"
|
rsync -a "$final_path/$app/instance/static/" "$datadir/static/"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ls -d $final_path/$app/priv/static/emoji/*/ | xargs -i sh -c 'mv "{}" "$datadir/static/emoji/$(basename {})"'
|
|
||||||
rsync -a "$final_path/$app/priv/static/emoji/" "$datadir/static/emoji/"
|
rsync -a "$final_path/$app/priv/static/emoji/" "$datadir/static/emoji/"
|
||||||
|
|
||||||
mkdir -p /etc/$app
|
mkdir -p /etc/$app
|
||||||
|
|
Loading…
Add table
Reference in a new issue