From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4255F139694 for ; Tue, 2 May 2017 17:16:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 618C6E0DF4; Tue, 2 May 2017 17:16:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3AE28E0DF4 for ; Tue, 2 May 2017 17:16:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 72B653416A6 for ; Tue, 2 May 2017 17:16:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A346C743F for ; Tue, 2 May 2017 17:16:00 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1493745346.7b3271b8f3747a83e9696193c804346ff2b9ea7c.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-multilib-r1.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 7b3271b8f3747a83e9696193c804346ff2b9ea7c X-VCS-Branch: master Date: Tue, 2 May 2017 17:16:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 37feadd6-7140-4226-a00c-35e6d18db03e X-Archives-Hash: 510899bbdd12c64bba25cf580b3aca26 commit: 7b3271b8f3747a83e9696193c804346ff2b9ea7c Author: Brian Evans gentoo org> AuthorDate: Tue May 2 17:15:46 2017 +0000 Commit: Brian Evans gentoo 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