diff options
| author | Maxime “pep” Buquet | 2017-10-20 18:38:46 +0100 |
|---|---|---|
| committer | Maxime “pep” Buquet | 2017-10-20 18:38:46 +0100 |
| commit | f3981ca7233bd86d6e5ea55b804c05018675aaf9 (patch) | |
| tree | f94697ca7ddbe4b69380fd13aad2a6c64c78e913 | |
| parent | 90d8f036539039229ced2f131a21b59b58cd729c (diff) | |
| download | aur-f3981ca7233bd86d6e5ea55b804c05018675aaf9.tar.gz | |
s/pre_remove/pre_upgrade and create symlinks in post_upgrade
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | movim.install | 6 |
3 files changed, 9 insertions, 5 deletions
@@ -1,7 +1,7 @@ pkgbase = movim-git pkgdesc = Movim is a decentralized social network, written in PHP and HTML5 and based on the XMPP standard protocol. pkgver = r5307.5705ffc9 - pkgrel = 5 + pkgrel = 6 url = https://movim.eu install = movim.install arch = any @@ -4,7 +4,7 @@ _pkgbase='movim' pkgname=movim-git pkgver=r5307.5705ffc9 -pkgrel=5 +pkgrel=6 pkgdesc="Movim is a decentralized social network, written in PHP and HTML5 and based on the XMPP standard protocol." arch=('any') url='https://movim.eu' @@ -50,8 +50,8 @@ package() { "$pkgdir/var/cache/webapps/$_pkgbase/users" chown -R root:http "$pkgdir/var/cache/webapps/$_pkgbase" chmod -R u+rwX,g+rwX,o-rwx "$pkgdir/var/cache/webapps/$_pkgbase" - ln -s "/var/cache/webapps/$_pkgbase/cache" "$pkgdir/usr/share/webapps/$_pkgbase/cache" - ln -s "/var/cache/webapps/$_pkgbase/users" "$pkgdir/usr/share/webapps/$_pkgbase/users" + # XXX: Symlinks created post_upgrade. Waiting for upstream to fix + # https://github.com/movim/movim/issues/509. cp -r app lib locales src themes vendor "$pkgdir/usr/share/webapps/$_pkgbase" install -Dm644 VERSION CHANGELOG.md INSTALL.md README.md index.php \ diff --git a/movim.install b/movim.install index c93df776c2d2..c3be29662cfc 100644 --- a/movim.install +++ b/movim.install @@ -1,4 +1,4 @@ -pre_remove() { +pre_upgrade() { if [ -d /usr/share/webapps/movim ] && [ ! -L /usr/share/webapps/movim/cache ]; then echo 'The "cache" and "users" folders in /usr/share/webapps/movim are' echo 'being moved to /var/cache/webapps/movim.' @@ -24,5 +24,9 @@ post_install() { } post_upgrade() { + # XXX: Waiting for upstream to fix https://github.com/movim/movim/issues/509 + ln -s /var/cache/webapps/movim/cache /usr/share/webapps/movim + ln -s /var/cache/webapps/movim/users /usr/share/webapps/movim + post_install $1 } |