package rpm: simplify

mroonga · Dec 16, 2015 · 19b8d85 · 19b8d85
1 parent dabbca2
commit 19b8d85
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/packages/rpm/centos/mysql55-mroonga.spec.in b/packages/rpm/centos/mysql55-mroonga.spec.in
@@ -97,10 +97,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 mysql_command=`scl enable mysql55 'which mysql'`
-password_option=""
-$mysql_command -u root -e "quit" > /dev/null 2>&1
-if [ $? -ne 0 ]; then
-    password_option="-p"
+if $mysql_command -u root -e "quit" > /dev/null 2>&1; then
+  password_option=""
+else
+  password_option="-p"
 fi
 current_version=0
 version=`echo %{groonga_required_version} | sed -e 's/\.//g'`

diff --git a/packages/rpm/centos/mysql56-community-mroonga.spec.in b/packages/rpm/centos/mysql56-community-mroonga.spec.in
@@ -103,10 +103,10 @@ else
 fi
 
 mysql_command=`which mysql`
-password_option=""
-$mysql_command -u root -e "quit" > /dev/null 2>&1
-if [ $? -ne 0 ]; then
-    password_option="-p"
+if $mysql_command -u root -e "quit" > /dev/null 2>&1; then
+  password_option=""
+else
+  password_option="-p"
 fi
 current_version=0
 version=`echo %{groonga_required_version} | sed -e 's/\.//g'`

diff --git a/packages/rpm/centos/percona-server-56-mroonga.spec.in b/packages/rpm/centos/percona-server-56-mroonga.spec.in
@@ -97,9 +97,11 @@ fi
 
 mysql_command=`which mysql`
 password_option=""
-$mysql_command -u root -e "quit" > /dev/null 2>&1
-if [ $? -ne 0 ]; then
-    password_option="-p"
+
+if $mysql_command -u root -e "quit" > /dev/null 2>&1; then
+  password_option=""
+else
+  password_option="-p"
 fi
 current_version=0
 version=`echo %{groonga_required_version} | sed -e 's/\.//g'`