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

[Sébastien Luttringer]

    Date: Tuesday, July 23, 2013 @ 21:26:00
  Author: seblu
Revision: 94418

upgpkg: dokuwiki 20130510-4

- move templates into /var/lib/dokuwiki to avoid files installed by admin in /usr
- cleanup quoting
- move files right and ownership in the package (no more install file)
- remove bugged find

This update (as the previous) can require user intervention.

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

------------------+
 PKGBUILD         |   58 +++++++++++++++++++++++++++++++----------------------
 dokuwiki.install |   14 ------------
 2 files changed, 35 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-23 18:48:07 UTC (rev 94417)
+++ PKGBUILD	2013-07-23 19:26:00 UTC (rev 94418)
@@ -1,43 +1,55 @@
 # $Id$
 # Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Sébastien Luttringer
 
 pkgname=dokuwiki
 pkgver=20130510
 _pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}
-pkgrel=3
-pkgdesc="DokuWiki engine"
+pkgrel=4
+pkgdesc='Simple to use and highly versatile Open Source wiki software'
 arch=('any')
-url="http://www.splitbrain.org/projects/dokuwiki"
+url='http://www.splitbrain.org/projects/dokuwiki'
 license=('GPL')
 depends=('php')
 backup=('etc/webapps/dokuwiki/.htaccess')
-install=dokuwiki.install
 options=('!strip')
-source=(http://www.splitbrain.org/_media/projects/dokuwiki/dokuwiki-${_pkgver}.tgz)
+source=("http://www.splitbrain.org/_media/projects/dokuwiki/dokuwiki-${_pkgver}.tgz")
 md5sums=('9cb5bb79c0445df849845b586e872677')
 
 package() {
-  cd $srcdir
-  install -dm0755 $pkgdir/usr/share/webapps/
-  install -dm0755 $pkgdir/var/lib/dokuwiki
-  install -dm0755 $pkgdir/etc/webapps/
-  cp -a $pkgname-${_pkgver} $pkgdir/usr/share/webapps/dokuwiki
+  cd "$pkgdir"
+  install -dm0755 usr/share/webapps var/lib/dokuwiki etc/webapps
+  cp -a "$srcdir"/$pkgname-${_pkgver} usr/share/webapps/dokuwiki
 
-  mv $pkgdir/usr/share/webapps/dokuwiki/data $pkgdir/var/lib/dokuwiki/data
-  ln -s /var/lib/dokuwiki/data $pkgdir/usr/share/webapps/dokuwiki/data
+  # move data in var
+  mv usr/share/webapps/dokuwiki/data var/lib/dokuwiki
+  ln -s {../../../../../var/lib/dokuwiki,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
+  # move plugins in var
+  mv usr/share/webapps/dokuwiki/lib/plugins var/lib/dokuwiki
+  ln -s {../../../../../../var/lib/dokuwiki,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 {} \;
+  # move templates in var
+  mv usr/share/webapps/dokuwiki/lib/tpl var/lib/dokuwiki
+  ln -s {../../../../../../var/lib/dokuwiki,usr/share/webapps/dokuwiki/lib}/tpl
 
-  mv $pkgdir/usr/share/webapps/dokuwiki/conf $pkgdir/etc/webapps/dokuwiki
-  ln -s /etc/webapps/dokuwiki $pkgdir/usr/share/webapps/dokuwiki/conf
-  chmod g=rwx $pkgdir/etc/webapps/dokuwiki
+  # move config in /etc
+  mv usr/share/webapps/dokuwiki/conf etc/webapps/dokuwiki
+  chmod g=rwx etc/webapps/dokuwiki
+  ln -s ../../../../../etc/webapps/dokuwiki usr/share/webapps/dokuwiki/conf
 
-  cp $pkgdir/usr/share/webapps/dokuwiki/.htaccess.dist $pkgdir/etc/webapps/dokuwiki/.htaccess
-  ln -s /etc/webapps/dokuwiki/.htaccess $pkgdir/usr/share/webapps/dokuwiki/.htaccess
+  # inform update on changes.log
+  touch var/lib/dokuwiki/data/changes.log
+  chmod 0644 var/lib/dokuwiki/data/changes.log
+
+  # use default htaccess
+  cp usr/share/webapps/dokuwiki/.htaccess.dist etc/webapps/dokuwiki/.htaccess
+  ln -s /etc/webapps/dokuwiki/.htaccess usr/share/webapps/dokuwiki/.htaccess
+
+  # fix rights and ownership
+  chown http:http var/lib/dokuwiki/plugins
+  chown -R http:http var/lib/dokuwiki/data
+  chown -R http:http etc/webapps/dokuwiki
 }
+
+# vim:set ts=2 sw=2 et:

Deleted: dokuwiki.install
===================================================================
--- dokuwiki.install	2013-07-23 18:48:07 UTC (rev 94417)
+++ dokuwiki.install	2013-07-23 19:26:00 UTC (rev 94418)
@@ -1,14 +0,0 @@
-post_install() {
-  echo "-- Go to the http://your-server/dokuwiki/install.php to setup 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"
-  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
-}