[gentoo-commits] proj/pgsql-patches:initscripts commit in: /

["Aaron Swenson" <titanofold@gentoo.org>]

commit:     e8efbbddf3279d45b51702f8465698b3c18ee7f6
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 03:18:25 2011 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 03:18:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=e8efbbdd

Refactor checkconfig() and replaced cp instruction with a mv.

---
 postgresql.init |   48 +++++++++++++++++++++++++-----------------------
 1 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/postgresql.init b/postgresql.init
index e51fa46..b44f93a 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init,v 1.1 2010/06/04 14:18:52 patrick Exp $
+# $Header: $
 
 opts="${opts} reload"
 
@@ -12,32 +12,34 @@ depend() {
 }
 
 checkconfig() {
-	if [ ! -d $DATA_DIR ] ; then
-		eerror "Directory not found: $DATA_DIR"
-		eerror "Please make sure that DATA_DIR points to the right path."
-		eerror "You can run 'emerge --config dev-db/postgresql-server:@SLOT@' to setup a new"
-		eerror "database cluster."
+	if [ ! -d ${DATA_DIR} ] ; then
+		eerror "Directory not found: ${DATA_DIR}"
+		eerror "HINT: Ensure that DATA_DIR points to the right path."
+		eerror "HINT: Or perhaps you need to create the database cluster:"
+		eerror "    emerge --config dev-db/postgresql-server:@SLOT@"
 		return 1
-	elif [ ! -f ${PGDATA%/}/postgresql.conf ] ; then
-		eerror "File not found: ${PGDATA%/}/postgresql.conf"
-		eerror "You may need to run:"
-		eerror "cp ${DATA_DIR%/}/postgresql.conf ${PGDATA%/}/postgresql.conf"
-		return 1
-	elif [ ! -f ${PGDATA%/}/pg_hba.conf ] ; then
-		eerror "File not found: ${PGDATA%/}/pg_hba.conf"
-		eerror "You may need to run:"
-		eerror "cp ${DATA_DIR%/}/pg_hba.conf ${PGDATA%/}/pg_hba.conf"
-		return 1
-	elif [ ! -f ${PGDATA%/}/pg_ident.conf ] ; then
-		eerror "File not found: ${PGDATA%/}/pg_ident.conf"
-		eerror "You may need to run:"
-		eerror "cp ${DATA_DIR%/}/pg_ident.conf ${PGDATA%/}/pg_ident.conf"
+	fi
+	if [ ! -f ${PGDATA%/}/postgresql.conf -o \
+		! -f ${PGDATA%/}/pg_hba.conf -o ! -f ${PGDATA%/}/pg_ident.conf ] ; then
+		eerror "The following file(s) were not found in ${PGDATA}:"
+		if [ ! -f ${PGDATA%/}/postgresql.conf ] ; then
+			eerror "    postgresql.conf"
+		fi
+		if [ ! -f ${PGDATA%/}/pg_hba.conf ] ; then
+			eerror "    pg_hba.conf"
+		fi
+		if [ ! -f ${PGDATA%/}/pg_ident.conf ] ; then
+			eerror "    pg_ident.conf"
+		fi
+		eerror  "HINT: Try:"
+		eerror "mv ${DATA_DIR%/}/*.conf ${PGDATA}"
 		return 1
-	elif [ -e /var/run/postgresql/.s.PGSQL.${PGPORT} ] ; then
+	fi
+	if [ -e /var/run/postgresql/.s.PGSQL.${PGPORT} ] ; then
 		eerror "Socket conflict."
 		eerror "A server is already listening on:"
-		eerror "/var/run/postgresql/.s.PGSQL.${PGPORT}"
-		eerror "Change PGPORT to listen on a different socket."
+		eerror "    /var/run/postgresql/.s.PGSQL.${PGPORT}"
+		eerror "HINT: Change PGPORT to listen on a different socket."
 		return 1
 	fi
 }