[gentoo-commits] proj/mysql:master commit in: eclass/

[Brian Evans]

commit:     7b3271b8f3747a83e9696193c804346ff2b9ea7c
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue May  2 17:15:46 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue May  2 17:15:46 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=7b3271b8

mysql-multilib-r1.eclass: Add additional path for mysql_install_db for 
pkg_config

 eclass/mysql-multilib-r1.eclass | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index c38e5fd..12bfe45 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -944,7 +944,7 @@ mysql-multilib-r1_pkg_config() {
        # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
        "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > 
"${sqltmp}" 2>/dev/null
 
-       local cmd
+       local cmd cmdtest
        local initialize_options
         if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && 
version_is_at_least "5.7.6" ; then
                # --initialize-insecure will not set root password
@@ -953,8 +953,14 @@ mysql-multilib-r1_pkg_config() {
                initialize_options="--initialize-insecure  
--init-file='${sqltmp}'"
                sqltmp="" # the initialize will take care of it
        else
-               cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" )
-               [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
+               for cmdtest in  
"${EROOT}usr/share/mariadb/scripts/mysql_install_db" \
+                               
"${EROOT}usr/share/mysql/scripts/mysql_install_db" \
+                               "${EROOT}usr/bin/mysql_install_db" ; do
+                       if [[ -x "${cmdtest}" ]] ; then
+                               cmd=( "${cmdtest}" )
+                               break
+                       fi
+               done
                if [[ -r "${help_tables}" ]] ; then
                        cat "${help_tables}" >> "${sqltmp}"
                fi