[Groonga-mysql-commit] mroonga/mroonga at da4ce61 [master] package rpm: expand abbreviation

Back to archive index

Kouhei Sutou null+****@clear*****
Thu Oct 29 21:36:28 JST 2015


Kouhei Sutou	2015-10-29 21:36:28 +0900 (Thu, 29 Oct 2015)

  New Revision: da4ce61dfb3459d891c3f173771488190abbcb56
  https://github.com/mroonga/mroonga/commit/da4ce61dfb3459d891c3f173771488190abbcb56

  Message:
    package rpm: expand abbreviation

  Modified files:
    packages/rpm/centos/mysql57-community-mroonga.spec.in

  Modified: packages/rpm/centos/mysql57-community-mroonga.spec.in (+3 -3)
===================================================================
--- packages/rpm/centos/mysql57-community-mroonga.spec.in    2015-10-29 21:35:52 +0900 (5b13efa)
+++ packages/rpm/centos/mysql57-community-mroonga.spec.in    2015-10-29 21:36:28 +0900 (496bfac)
@@ -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
-  MYSQL_PWD=`awk '/root �� localhost/{print $NF}' /var/log/mysqld.log`
+  MYSQL_PASSWORD=`awk '/root �� localhost/{print $NF}' /var/log/mysqld.log`
 else
   stop_after_installation=0
 fi
@@ -146,7 +146,7 @@ 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'"
+  $mysql_command -u root --connect-expired-password -e "ALTER USER user() IDENTIFIED BY '$MYSQL_PASSWORD'"
   password_option=""
 fi
 
@@ -158,7 +158,7 @@ eval $command || \
 
 if [ "$stop_after_installation" = "1" ]; then
   $mysql_command -u root -e "ALTER USER root �� localhost PASSWORD EXPIRE"
-  unset MYSQL_PWD
+  unset MYSQL_PASSWORD
   /sbin/service mysqld stop
 fi
 
-------------- next part --------------
HTML����������������������������...
다운로드 



More information about the Groonga-mysql-commit mailing list
Back to archive index