dev-db/mysql: [QA] Fix UnnecessarySlashStrip

Signed-off-by: David Seifert <soap@gentoo.org>

diff --git a/dev-db/mysql/mysql-5.6.44-r1.ebuild b/dev-db/mysql/mysql-5.6.44-r1.ebuild
index 65e3344297027ed1970db14da077bdd0cb26f55f..faeb67ff009aba78f296a04a319a72431d178ef5 100644 (file)
--- a/dev-db/mysql/mysql-5.6.44-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.44-r1.ebuild
@@ -536,10 +536,10 @@ src_test() {
 }
 
 mysql_init_vars() {
-       MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-       MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-       MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-       MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+       MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+       MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+       MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+       MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
 
        if [[ -z "${MY_DATADIR}" ]] ; then
                MY_DATADIR=""
@@ -602,7 +602,7 @@ pkg_config() {
        local old_MY_DATADIR="${MY_DATADIR}"
        local old_HOME="${HOME}"
        # my_print_defaults needs to read stuff in $HOME/.my.cnf
-       export HOME=${EPREFIX%/}/root
+       export HOME=${EPREFIX}/root
 
        # Make sure the vars are correctly initialized
        mysql_init_vars
@@ -763,13 +763,13 @@ pkg_config() {
        if [[ -r "${help_tables}" ]] ; then
                cat "${help_tables}" >> "${sqltmp}"
        fi
-       cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+       cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
        einfo "Command: ${cmd[*]}"
        su -s /bin/sh -c "${cmd[*]}" mysql \
                >"${TMPDIR%/}"/mysql_install_db.log 2>&1
        if [ $? -ne 0 ]; then
                grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-               die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+               die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
        fi
        popd &>/dev/null || die
        [[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \

diff --git a/dev-db/mysql/mysql-5.6.45-r2.ebuild b/dev-db/mysql/mysql-5.6.45-r2.ebuild
index 1ea042478213dd0dde082ceadb9e4714b6bfc15d..5dffcad9902f1e5ea835f881c347229a544a6e19 100644 (file)
--- a/dev-db/mysql/mysql-5.6.45-r2.ebuild
+++ b/dev-db/mysql/mysql-5.6.45-r2.ebuild
@@ -545,10 +545,10 @@ src_test() {
 }
 
 mysql_init_vars() {
-       MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-       MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-       MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-       MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+       MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+       MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+       MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+       MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
 
        if [[ -z "${MY_DATADIR}" ]] ; then
                MY_DATADIR=""
@@ -611,7 +611,7 @@ pkg_config() {
        local old_MY_DATADIR="${MY_DATADIR}"
        local old_HOME="${HOME}"
        # my_print_defaults needs to read stuff in $HOME/.my.cnf
-       export HOME=${EPREFIX%/}/root
+       export HOME=${EPREFIX}/root
 
        # Make sure the vars are correctly initialized
        mysql_init_vars
@@ -772,13 +772,13 @@ pkg_config() {
        if [[ -r "${help_tables}" ]] ; then
                cat "${help_tables}" >> "${sqltmp}"
        fi
-       cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+       cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
        einfo "Command: ${cmd[*]}"
        su -s /bin/sh -c "${cmd[*]}" mysql \
                >"${TMPDIR%/}"/mysql_install_db.log 2>&1
        if [ $? -ne 0 ]; then
                grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-               die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+               die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
        fi
        popd &>/dev/null || die
        [[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \

diff --git a/dev-db/mysql/mysql-5.7.26-r1.ebuild b/dev-db/mysql/mysql-5.7.26-r1.ebuild
index 7cf6286849dfcdae764ff4781f156448613ee4d8..47e299be17fd76a9ba6f62c9d8d02fafc9570d30 100644 (file)
--- a/dev-db/mysql/mysql-5.7.26-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.26-r1.ebuild
@@ -125,10 +125,10 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 
 mysql_init_vars() {
-       MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-       MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-       MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-       MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+       MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+       MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+       MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+       MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
 
        if [[ -z "${MY_DATADIR}" ]] ; then
                MY_DATADIR=""
@@ -333,9 +333,9 @@ multilib_src_configure() {
        mycmakeargs=(
                -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
                -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-               -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-               -DMYSQL_DATADIR="${EPREFIX%/}/var/lib/mysql"
-               -DSYSCONFDIR="${EPREFIX%/}/etc/mysql"
+               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+               -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+               -DSYSCONFDIR="${EPREFIX}/etc/mysql"
                -DINSTALL_BINDIR=bin
                -DINSTALL_DOCDIR=share/doc/${PF}
                -DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -346,9 +346,9 @@ multilib_src_configure() {
                -DINSTALL_MYSQLSHAREDIR=share/mysql
                -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
                -DINSTALL_SCRIPTDIR=share/mysql/scripts
-               -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+               -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
                -DINSTALL_SBINDIR=sbin
-               -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+               -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
                -DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
                -DWITH_UNIT_TESTS=$(usex test ON OFF)
                ### TODO: make this system but issues with UTF-8 prevent it
@@ -356,7 +356,7 @@ multilib_src_configure() {
                -DWITH_ZLIB=system
                -DWITH_LIBWRAP=0
                -DENABLED_LOCAL_INFILE=1
-               -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+               -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
                -DWITH_DEFAULT_COMPILER_OPTIONS=0
                -DWITH_DEFAULT_FEATURE_SET=0
                # The build forces this to be defined when cross-compiling. We pass it
@@ -774,7 +774,7 @@ pkg_config() {
        local old_MY_DATADIR="${MY_DATADIR}"
        local old_HOME="${HOME}"
        # my_print_defaults needs to read stuff in $HOME/.my.cnf
-       export HOME=${EPREFIX%/}/root
+       export HOME=${EPREFIX}/root
 
        # Make sure the vars are correctly initialized
        mysql_init_vars
@@ -930,13 +930,13 @@ pkg_config() {
        # --initialize-insecure will not set root password
        # --initialize would set a random one in the log which we don't need as we set it ourselves
        local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
-       cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+       cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
        einfo "Command: ${cmd[*]}"
        su -s /bin/sh -c "${cmd[*]}" mysql \
                >"${TMPDIR%/}"/mysql_install_db.log 2>&1
        if [[ $? -ne 0 ]] ; then
                grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-               die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+               die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
        fi
        popd &>/dev/null || die
        [[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \

diff --git a/dev-db/mysql/mysql-5.7.27-r1.ebuild b/dev-db/mysql/mysql-5.7.27-r1.ebuild
index 5a103007c82a3a8988170424a948e60e17deee5e..9880be9414d6e683f863852f19c34cf293f23fe4 100644 (file)
--- a/dev-db/mysql/mysql-5.7.27-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.27-r1.ebuild
@@ -133,10 +133,10 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 
 mysql_init_vars() {
-       MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-       MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-       MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-       MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+       MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+       MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+       MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+       MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
 
        if [[ -z "${MY_DATADIR}" ]] ; then
                MY_DATADIR=""
@@ -344,9 +344,9 @@ multilib_src_configure() {
        mycmakeargs=(
                -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
                -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-               -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-               -DMYSQL_DATADIR="${EPREFIX%/}/var/lib/mysql"
-               -DSYSCONFDIR="${EPREFIX%/}/etc/mysql"
+               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+               -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+               -DSYSCONFDIR="${EPREFIX}/etc/mysql"
                -DINSTALL_BINDIR=bin
                -DINSTALL_DOCDIR=share/doc/${PF}
                -DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -357,9 +357,9 @@ multilib_src_configure() {
                -DINSTALL_MYSQLSHAREDIR=share/mysql
                -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
                -DINSTALL_SCRIPTDIR=share/mysql/scripts
-               -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+               -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
                -DINSTALL_SBINDIR=sbin
-               -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+               -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
                -DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
                -DWITH_UNIT_TESTS=$(usex test ON OFF)
                ### TODO: make this system but issues with UTF-8 prevent it
@@ -367,7 +367,7 @@ multilib_src_configure() {
                -DWITH_ZLIB=system
                -DWITH_LIBWRAP=0
                -DENABLED_LOCAL_INFILE=1
-               -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+               -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
                -DWITH_DEFAULT_COMPILER_OPTIONS=0
                -DWITH_DEFAULT_FEATURE_SET=0
                # The build forces this to be defined when cross-compiling. We pass it
@@ -785,7 +785,7 @@ pkg_config() {
        local old_MY_DATADIR="${MY_DATADIR}"
        local old_HOME="${HOME}"
        # my_print_defaults needs to read stuff in $HOME/.my.cnf
-       export HOME=${EPREFIX%/}/root
+       export HOME=${EPREFIX}/root
 
        # Make sure the vars are correctly initialized
        mysql_init_vars
@@ -941,13 +941,13 @@ pkg_config() {
        # --initialize-insecure will not set root password
        # --initialize would set a random one in the log which we don't need as we set it ourselves
        local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
-       cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+       cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
        einfo "Command: ${cmd[*]}"
        su -s /bin/sh -c "${cmd[*]}" mysql \
                >"${TMPDIR%/}"/mysql_install_db.log 2>&1
        if [[ $? -ne 0 ]] ; then
                grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-               die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+               die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
        fi
        popd &>/dev/null || die
        [[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \

diff --git a/dev-db/mysql/mysql-5.7.29.ebuild b/dev-db/mysql/mysql-5.7.29.ebuild
index d87e28c839bd58393c3d878c609086e214b34406..ece65c60cc6072ea1126fae608b4c6ce25133b93 100644 (file)
--- a/dev-db/mysql/mysql-5.7.29.ebuild
+++ b/dev-db/mysql/mysql-5.7.29.ebuild
@@ -131,10 +131,10 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 
 mysql_init_vars() {
-       MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
-       MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
-       MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
-       MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
+       MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
+       MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
+       MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
+       MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
 
        if [[ -z "${MY_DATADIR}" ]] ; then
                MY_DATADIR=""
@@ -342,9 +342,9 @@ multilib_src_configure() {
        mycmakeargs=(
                -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
                -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-               -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
-               -DMYSQL_DATADIR="${EPREFIX%/}/var/lib/mysql"
-               -DSYSCONFDIR="${EPREFIX%/}/etc/mysql"
+               -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+               -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
+               -DSYSCONFDIR="${EPREFIX}/etc/mysql"
                -DINSTALL_BINDIR=bin
                -DINSTALL_DOCDIR=share/doc/${PF}
                -DINSTALL_DOCREADMEDIR=share/doc/${PF}
@@ -355,9 +355,9 @@ multilib_src_configure() {
                -DINSTALL_MYSQLSHAREDIR=share/mysql
                -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
                -DINSTALL_SCRIPTDIR=share/mysql/scripts
-               -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql"
+               -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
                -DINSTALL_SBINDIR=sbin
-               -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql"
+               -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
                -DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
                -DWITH_UNIT_TESTS=$(usex test ON OFF)
                ### TODO: make this system but issues with UTF-8 prevent it
@@ -365,7 +365,7 @@ multilib_src_configure() {
                -DWITH_ZLIB=system
                -DWITH_LIBWRAP=0
                -DENABLED_LOCAL_INFILE=1
-               -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+               -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
                -DWITH_DEFAULT_COMPILER_OPTIONS=0
                -DWITH_DEFAULT_FEATURE_SET=0
                # The build forces this to be defined when cross-compiling. We pass it
@@ -783,7 +783,7 @@ pkg_config() {
        local old_MY_DATADIR="${MY_DATADIR}"
        local old_HOME="${HOME}"
        # my_print_defaults needs to read stuff in $HOME/.my.cnf
-       export HOME=${EPREFIX%/}/root
+       export HOME=${EPREFIX}/root
 
        # Make sure the vars are correctly initialized
        mysql_init_vars
@@ -939,13 +939,13 @@ pkg_config() {
        # --initialize-insecure will not set root password
        # --initialize would set a random one in the log which we don't need as we set it ourselves
        local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" )
-       cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
+       cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
        einfo "Command: ${cmd[*]}"
        su -s /bin/sh -c "${cmd[*]}" mysql \
                >"${TMPDIR%/}"/mysql_install_db.log 2>&1
        if [[ $? -ne 0 ]] ; then
                grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
-               die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
+               die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
        fi
        popd &>/dev/null || die
        [[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \