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

[Bartłomiej Piotrowski]

    Date: Saturday, February 23, 2013 @ 22:31:40
  Author: bpiotrowski
Revision: 84733

upgpkg: mariadb 5.5.29-3

- don't try to assign $datadir if package wasn't installed

Modified:
  mariadb/trunk/PKGBUILD
  mariadb/trunk/mariadb.install

-----------------+
 PKGBUILD        |    2 +-
 mariadb.install |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-23 20:56:41 UTC (rev 84732)
+++ PKGBUILD	2013-02-23 21:31:40 UTC (rev 84733)
@@ -4,7 +4,7 @@
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
 pkgver=5.5.29
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://mariadb.org/'

Modified: mariadb.install
===================================================================
--- mariadb.install	2013-02-23 20:56:41 UTC (rev 84732)
+++ mariadb.install	2013-02-23 21:31:40 UTC (rev 84733)
@@ -1,7 +1,7 @@
-datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p")
-[[ -z $datadir ]] && datadir=/var/lib/mysql
+post_install(){
+  datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p")
+  [[ -z $datadir ]] && datadir=/var/lib/mysql
 
-post_install(){
   groupadd -g 89 mysql &>/dev/null
   useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
 
@@ -15,6 +15,9 @@
 }
 
 post_upgrade(){
+  datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p")
+  [[ -z $datadir ]] && datadir=/var/lib/mysql
+
   getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
   getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null