[gentoo-commits] gentoo-x86 commit in dev-db/mysql-init-scripts/files: init.d-2.0 mysql-5.1.67-init.d

[gentoo-commits] gentoo-x86 commit in dev-db/mysql-init-scripts/files: init.d-2.0 mysql-5.1.67-init.d

[Brian Evans (grknight)]

grknight    14/09/23 01:23:27

  Modified:             init.d-2.0 mysql-5.1.67-init.d
  Log:
  Remove bashisms and change error message for new installs
  
  (Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D)

Revision  Changes    Path
1.3                  dev-db/mysql-init-scripts/files/init.d-2.0

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/files/init.d-2.0?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/files/init.d-2.0?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/files/init.d-2.0?r1=1.2&r2=1.3

Index: init.d-2.0
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/init.d-2.0,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- init.d-2.0	15 Sep 2014 14:17:12 -0000	1.2
+++ init.d-2.0	23 Sep 2014 01:23:27 -0000	1.3
@@ -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 @@
 		# 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 @@
 	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



1.2                  dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d?r1=1.1&r2=1.2

Index: mysql-5.1.67-init.d
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mysql-5.1.67-init.d	18 Jan 2013 01:51:47 -0000	1.1
+++ mysql-5.1.67-init.d	23 Sep 2014 01:23:27 -0000	1.2
@@ -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 @@
 	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