From b6aa5bf52654a37262e1c7f96393d02abbd90aa6 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 24 Sep 2014 23:13:50 +0530 Subject: [PATCH] init: use the `-e` mysql flag to specify the query --- assets/init | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/init b/assets/init index a335c51c..3050e2aa 100755 --- a/assets/init +++ b/assets/init @@ -290,10 +290,10 @@ if [ "${DB_HOST}" == "localhost" ]; then sleep 1 done - if ! echo "USE ${DB_NAME}" | mysql -uroot ${DB_PASS:+-p$DB_PASS} >/dev/null 2>&1; then + if ! mysql -uroot ${DB_PASS:+-p$DB_PASS} -e "USE ${DB_NAME};" >/dev/null 2>&1; then DB_INIT="yes" - echo "CREATE DATABASE IF NOT EXISTS \`${DB_NAME}\` DEFAULT CHARACTER SET \`utf8\` COLLATE \`utf8_unicode_ci\`;" | mysql -uroot ${DB_PASS:+-p$DB_PASS} - echo "GRANT SELECT, LOCK TABLES, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER ON \`${DB_NAME}\`.* TO 'root'@'localhost';" | mysql -uroot ${DB_PASS:+-p$DB_PASS} + mysql -uroot ${DB_PASS:+-p$DB_PASS} -e "CREATE DATABASE IF NOT EXISTS \`${DB_NAME}\` DEFAULT CHARACTER SET \`utf8\` COLLATE \`utf8_unicode_ci\`;" + mysql -uroot ${DB_PASS:+-p$DB_PASS} -e "GRANT SELECT, LOCK TABLES, INSERT, UPDATE, DELETE, CREATE, DROP, INDEX, ALTER ON \`${DB_NAME}\`.* TO 'root'@'localhost';" fi fi