Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH] mysql-multilib-r1.eclass: Replace unnecessary eval with bash array
Date: Thu, 23 Feb 2017 16:59:29
Message-Id: 20170223165908.9419-1-mgorny@gentoo.org
1 ---
2 eclass/mysql-multilib-r1.eclass | 12 ++++++------
3 1 file changed, 6 insertions(+), 6 deletions(-)
4
5 diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
6 index 38fcc7c0ecf8..a92fac0a1cfc 100644
7 --- a/eclass/mysql-multilib-r1.eclass
8 +++ b/eclass/mysql-multilib-r1.eclass
9 @@ -942,19 +942,19 @@ mysql-multilib-r1_pkg_config() {
10 if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && version_is_at_least "5.7.6" ; then
11 # --initialize-insecure will not set root password
12 # --initialize would set a random one in the log which we don't need as we set it ourselves
13 - cmd="${EROOT}usr/sbin/mysqld"
14 + cmd=( "${EROOT}usr/sbin/mysqld" )
15 initialize_options="--initialize-insecure '--init-file=${sqltmp}'"
16 sqltmp="" # the initialize will take care of it
17 else
18 - cmd="${EROOT}usr/share/mysql/scripts/mysql_install_db"
19 - [[ -f "${cmd}" ]] || cmd="${EROOT}usr/bin/mysql_install_db"
20 + cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" )
21 + [[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
22 if [[ -r "${help_tables}" ]] ; then
23 cat "${help_tables}" >> "${sqltmp}"
24 fi
25 fi
26 - cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${ROOT}/${MY_DATADIR}' '--tmpdir=${ROOT}/${MYSQL_TMPDIR}' ${initialize_options}"
27 - einfo "Command: $cmd"
28 - eval $cmd \
29 + cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" "--tmpdir=${ROOT}/${MYSQL_TMPDIR}" ${initialize_options} )
30 + einfo "Command: ${cmd[*]}"
31 + "${cmd[@]}" \
32 >"${TMPDIR}"/mysql_install_db.log 2>&1
33 if [ $? -ne 0 ]; then
34 grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
35 --
36 2.11.1