yoku0825
null+****@clear*****
Fri Oct 30 11:00:08 JST 2015
yoku0825 2015-10-30 11:00:08 +0900 (Fri, 30 Oct 2015) New Revision: 9f001e1cb8044383c15a9796ba3579c89e05e2a8 https://github.com/mroonga/mroonga/commit/9f001e1cb8044383c15a9796ba3579c89e05e2a8 Merged 919a689: Merge pull request #79 from yoku0825/fix_mysql57_installation_2 Message: Fix to Not using MYSQL_PWD Modified files: packages/rpm/centos/mysql57-community-mroonga.spec.in Modified: packages/rpm/centos/mysql57-community-mroonga.spec.in (+9 -5) =================================================================== --- packages/rpm/centos/mysql57-community-mroonga.spec.in 2015-10-30 10:22:49 +0900 (ca937b7) +++ packages/rpm/centos/mysql57-community-mroonga.spec.in 2015-10-30 11:00:08 +0900 (f7f7565) @@ -107,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT if ! /sbin/service mysqld status > /dev/null; then /sbin/service mysqld start stop_after_installation=1 - export MYSQL_PWD=`awk '/root �� localhost/{print $NF}' /var/log/mysqld.log` + auto_generated_password=`awk '/root �� localhost/{print $NF}' /var/log/mysqld.log` else stop_after_installation=0 fi @@ -146,8 +146,11 @@ if [ "$1" = 2 ] ; then fi if [ -n "$password_option" -a "$stop_after_installation" = "1" ]; then - $mysql_command -u root --connect-expired-password -e "ALTER USER user() IDENTIFIED BY '$MYSQL_PWD'" - password_option="" + sql="ALTER USER user() IDENTIFIED BY '$auto_generated_password'" + command="$mysql_command -u root -p'$auto_generated_password' \ + --connect-expired-password -e \"$sql\"" + eval $command + password_option="-p'$auto_generated_password'" fi command="$mysql_command -u root $password_option < ${install_sql}" @@ -157,8 +160,9 @@ eval $command || \ echo " $command") if [ "$stop_after_installation" = "1" ]; then - $mysql_command -u root -e "ALTER USER root �� localhost PASSWORD EXPIRE" - unset MYSQL_PWD + sql="ALTER USER root �� localhost PASSWORD EXPIRE" + command="$mysql_command -u root -p'$auto_generated_password' -e \"$sql\"" + eval $command /sbin/service mysqld stop fi -------------- next part -------------- HTML����������������������������...Download