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

[Bartłomiej Piotrowski]

    Date: Monday, February 25, 2013 @ 17:42:59
  Author: bpiotrowski
Revision: 178549

upgpkg: mysql 5.5.30-5

Simplify install script.

Modified:
  mysql/trunk/PKGBUILD
  mysql/trunk/mysql.install

---------------+
 PKGBUILD      |    2 +-
 mysql.install |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-25 16:39:24 UTC (rev 178548)
+++ PKGBUILD	2013-02-25 16:42:59 UTC (rev 178549)
@@ -5,7 +5,7 @@
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.30
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 license=('GPL')
 url="https://www.mysql.com/products/community/"

Modified: mysql.install
===================================================================
--- mysql.install	2013-02-25 16:39:24 UTC (rev 178548)
+++ mysql.install	2013-02-25 16:42:59 UTC (rev 178549)
@@ -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
-
   groupadd -g 89 mysql &>/dev/null
   useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
 
@@ -16,7 +16,7 @@
 
 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 /var/lib/mysql -s /bin/false mysql &>/dev/null
+  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
 
   if [ "$(vercmp $2 5.5)" -lt 0 ]; then
     echo " >> "