[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gentoo-dev
Subject:    [gentoo-dev] [PATCH] mysql-multilib-r1.eclass: Replace unnecessary eval with bash array
From:       Michał Górny <mgorny () gentoo ! org>
Date:       2017-02-23 16:59:08
Message-ID: 20170223165908.9419-1-mgorny () gentoo ! org
[Download RAW message or body]

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

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index 38fcc7c0ecf8..a92fac0a1cfc 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -942,19 +942,19 @@ mysql-multilib-r1_pkg_config() {
         if [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \
version_is_at_least "5.7.6" ; then  # --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
-		cmd="${EROOT}usr/sbin/mysqld"
+		cmd=( "${EROOT}usr/sbin/mysqld" )
 		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"
+		cmd=( "${EROOT}usr/share/mysql/scripts/mysql_install_db" )
+		[[ -f "${cmd}" ]] || cmd=( "${EROOT}usr/bin/mysql_install_db" )
 		if [[ -r "${help_tables}" ]] ; then
 			cat "${help_tables}" >> "${sqltmp}"
 		fi
 	fi
-	cmd="'$cmd' '--basedir=${EPREFIX}/usr' ${options} '--datadir=${ROOT}/${MY_DATADIR}' \
                '--tmpdir=${ROOT}/${MYSQL_TMPDIR}' ${initialize_options}"
-	einfo "Command: $cmd"
-	eval $cmd \
+	cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT}/${MY_DATADIR}" \
"--tmpdir=${ROOT}/${MYSQL_TMPDIR}" ${initialize_options} ) +	einfo "Command: \
${cmd[*]}" +	"${cmd[@]}" \
 		>"${TMPDIR}"/mysql_install_db.log 2>&1
 	if [ $? -ne 0 ]; then
 		grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
-- 
2.11.1


[prev in list] [next in list] [prev in thread] [next in thread]