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

[Bartłomiej Piotrowski]

    Date: Saturday, March 7, 2015 @ 15:04:55
  Author: bpiotrowski
Revision: 232972

upgpkg: mariadb 10.0.17-2

remove all $datadir occurences from install file (FS#44076)

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-07 12:27:53 UTC (rev 232971)
+++ PKGBUILD	2015-03-07 14:04:55 UTC (rev 232972)
@@ -5,7 +5,7 @@
 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/'

Modified: mariadb.install
===================================================================
--- mariadb.install	2015-03-07 12:27:53 UTC (rev 232971)
+++ mariadb.install	2015-03-07 14:04:55 UTC (rev 232972)
@@ -2,7 +2,7 @@
   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_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