Remove bashisms and change error message for new installs

(Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D)

3 files changed, 19 insertions, 8 deletions

diff --git a/dev-db/mysql-init-scripts/ChangeLog b/dev-db/mysql-init-scripts/ChangeLog
index b274ee72ac8b..c386f68b19e8 100644
--- a/dev-db/mysql-init-scripts/ChangeLog
+++ b/dev-db/mysql-init-scripts/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql-init-scripts
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.42 2014/09/15 14:17:12 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.43 2014/09/23 01:23:27 grknight Exp $
+
+  23 Sep 2014; Brian Evans <grknight@gentoo.org> files/init.d-2.0,
+  files/mysql-5.1.67-init.d:
+  Remove bashisms and change error message for new installs
 
 *mysql-init-scripts-2.0-r1 (15 Sep 2014)
 
diff --git a/dev-db/mysql-init-scripts/files/init.d-2.0 b/dev-db/mysql-init-scripts/files/init.d-2.0
index d0a0db011b61..2d0574588a94 100644
--- a/dev-db/mysql-init-scripts/files/init.d-2.0
+++ b/dev-db/mysql-init-scripts/files/init.d-2.0
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/init.d-2.0,v 1.2 2014/09/15 14:17:12 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/init.d-2.0,v 1.3 2014/09/23 01:23:27 grknight Exp $
 
 extra_commands="checkconfig"
 
@@ -73,7 +73,7 @@ start() {
 		# find which package is installed to report an error
 		local EROOT=$(portageq envvar EROOT)
 		local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql))
-		if [[ -z ${DBPKG_P} ]] ; then
+		if [ -z ${DBPKG_P} ] ; then
 			eerror "You don't appear to have a server package installed yet."
 		else
 			eerror "You don't appear to have the mysql database installed yet."
@@ -139,7 +139,7 @@ checkconfig() {
 	local svc_name=$(mysql_svcname)
 	ebegin "Checking mysqld configuration for ${svc_name}"
 
-	if [ ${RC_CMD} == "checkconfig" ] ; then
+	if [ ${RC_CMD} = "checkconfig" ] ; then
 		# We are calling checkconfig specifically.  Print warnings regardless.
 		"${basedir}"/sbin/mysqld --defaults-file="${my_cnf}" --help --verbose > /dev/null
 	else
diff --git a/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d b/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d
index 511a6bfdf318..e1fb608b4515 100644
--- a/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d
+++ b/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d,v 1.1 2013/01/18 01:51:47 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d,v 1.2 2014/09/23 01:23:27 grknight Exp $
 
 depend() {
 	use net.lo
@@ -59,8 +59,15 @@ start() {
 	fi
 
 	if [ ! -d "${datadir}"/mysql ] ; then
-		eerror "You don't appear to have the mysql database installed yet."
-		eerror "Please run /usr/bin/mysql_install_db to have this done..."
+		# find which package is installed to report an error
+		local EROOT=$(portageq envvar EROOT)
+		local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql))
+		if [ -z ${DBPKG_P} ] ; then
+			eerror "You don't appear to have a server package installed yet."
+		else
+			eerror "You don't appear to have the mysql database installed yet."
+			eerror "Please run \`emerge --config =${DBPKG_P}\` to have this done..."
+		fi
 		return 1
 	fi