diff options
| author |   David Seifert <soap@gentoo.org> | 2020-02-08 17:50:46 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2020-02-08 17:50:46 +0100 |
| commit | aa7078b38920d351b8f45bb0fb856b456c59e530 (patch) | |
| tree | dff5abb4d864ef8fce3939abfa9910bc53ca5c5b /dev-db/mysql/mysql-5.6.44-r1.ebuild | |
| parent | dev-db/mariadb-connector-c: [QA] Fix UnnecessarySlashStrip (diff) | |
| download | gentoo-aa7078b38920d351b8f45bb0fb856b456c59e530.tar.gz gentoo-aa7078b38920d351b8f45bb0fb856b456c59e530.tar.bz2 gentoo-aa7078b38920d351b8f45bb0fb856b456c59e530.zip | |
dev-db/mysql: [QA] Fix UnnecessarySlashStrip
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-db/mysql/mysql-5.6.44-r1.ebuild')
| -rw-r--r-- | dev-db/mysql/mysql-5.6.44-r1.ebuild | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/dev-db/mysql/mysql-5.6.44-r1.ebuild b/dev-db/mysql/mysql-5.6.44-r1.ebuild index 65e334429702..faeb67ff009a 100644 --- 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" ]] \ |