git » mariadb.git » commit 783e5ec

diff --git a/PKGBUILD b/PKGBUILD
index 9e1657a..1120316 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
 pkgver=10.0.17
 _pkgver=${pkgver/.a/a}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://mariadb.org/'
diff --git a/mariadb.install b/mariadb.install
index 8b12932..25799e6 100644
--- a/mariadb.install
+++ b/mariadb.install
@@ -2,7 +2,7 @@ post_install(){
   groupadd -g 89 mysql &>/dev/null
   useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null
 
-  if [[ ! -e $datadir ]]; then
+  if [[ ! -e var/lib/mysql ]]; then
     install -dm700 var/lib/mysql
     chown -R mysql:mysql var/lib/mysql &>/dev/null
   fi
@@ -16,11 +16,12 @@ post_install(){
 
 post_upgrade(){
   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
+  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql \
+    -s /bin/false mysql &>/dev/null
 
   if [[ "$(vercmp $2 5.5.25-4)" -lt 0 ]] && [[ -d /data ]]; then
     for x in data/*; do
-      cp -r $x $datadir/
+      cp -r $x var/lib/mysql
     done
     rm -rf data
   fi