[arch-commits] Commit in dokuwiki/trunk (PKGBUILD dokuwiki.install)

[Sergej Pupykin]

    Date: Monday, July 22, 2013 @ 15:22:05
  Author: spupykin
Revision: 94364

upgpkg: dokuwiki 20130510-3

upd

Modified:
  dokuwiki/trunk/PKGBUILD
  dokuwiki/trunk/dokuwiki.install

------------------+
 PKGBUILD         |   12 ++++++++----
 dokuwiki.install |    7 +++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-22 12:54:26 UTC (rev 94363)
+++ PKGBUILD	2013-07-22 13:22:05 UTC (rev 94364)
@@ -5,7 +5,7 @@
 pkgname=dokuwiki
 pkgver=20130510
 _pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}
-pkgrel=2
+pkgrel=3
 pkgdesc="DokuWiki engine"
 arch=('any')
 url="http://www.splitbrain.org/projects/dokuwiki"
@@ -20,12 +20,16 @@
 package() {
   cd $srcdir
   install -dm0755 $pkgdir/usr/share/webapps/
-  install -dm0755 $pkgdir/var/lib/
+  install -dm0755 $pkgdir/var/lib/dokuwiki
   install -dm0755 $pkgdir/etc/webapps/
   cp -a $pkgname-${_pkgver} $pkgdir/usr/share/webapps/dokuwiki
 
-  mv $pkgdir/usr/share/webapps/dokuwiki/data $pkgdir/var/lib/dokuwiki
-  ln -s /var/lib/dokuwiki $pkgdir/usr/share/webapps/dokuwiki/data
+  mv $pkgdir/usr/share/webapps/dokuwiki/data $pkgdir/var/lib/dokuwiki/data
+  ln -s /var/lib/dokuwiki/data $pkgdir/usr/share/webapps/dokuwiki/data
+
+  mv $pkgdir/usr/share/webapps/dokuwiki/lib/plugins $pkgdir/var/lib/dokuwiki/plugins
+  ln -s /var/lib/dokuwiki/plugins $pkgdir/usr/share/webapps/dokuwiki/lib/plugins
+
   touch $pkgdir/var/lib/dokuwiki/changes.log
   chmod 0644 $pkgdir/var/lib/dokuwiki/changes.log
   find $pkgdir/var/lib/dokuwiki -type f -exec chmod g=rw {} \; && find -type d -exec chmod g=rwx {} \;

Modified: dokuwiki.install
===================================================================
--- dokuwiki.install	2013-07-22 12:54:26 UTC (rev 94363)
+++ dokuwiki.install	2013-07-22 13:22:05 UTC (rev 94364)
@@ -1,11 +1,14 @@
 post_install() {
   echo "-- Go to the http://your-server/dokuwiki/install.php to setup dokuwiki"
-  chown -R http:http /var/lib/dokuwiki
+  chown -R http:http /var/lib/dokuwiki/data
+  chown http:http /var/lib/dokuwiki/plugins
   chown -R http:http /etc/webapps/dokuwiki
 }
 
 post_upgrade() {
   echo "-- Since 20120125_a-1 dokuwiki is in /usr/share/webapps"
-  chown -R http:http /var/lib/dokuwiki
+  echo "-- Since 20130510-3 /var/lib/dokuwiki moved to /var/lib/dokuwiki/data"
+  chown -R http:http /var/lib/dokuwiki/data
+  chown http:http /var/lib/dokuwiki/plugins
   chown -R http:http /etc/webapps/dokuwiki
 }