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

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

commit:     44140402fb5ae05d75b43e9dde84f11d6c036dcd
Author:     Aaron W. Swenson <titanofold <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 02:09:12 2011 +0000
Commit:     Aaron Swenson <titanofold <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 02:09:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pgsql-patches.git;a=commit;h=44140402

Working towards file permission checking.

---
 postgresql.init |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/postgresql.init b/postgresql.init
index 26e1b8b..b7ee23e 100644
--- a/postgresql.init
+++ b/postgresql.init
@@ -12,6 +12,10 @@ depend() {
 }
 
 checkconfig() {
+	if [ -z ${DATA_DIR} ] ; then
+		eerror "DATA_DIR not set"
+		eerror "HINT: Did you not update /etc/conf.d/postgresql-@SLOT@"
+	fi
 	if [ ! -d ${DATA_DIR} ] ; then
 		eerror "Directory not found: ${DATA_DIR}"
 		eerror "HINT: Ensure that DATA_DIR points to the right path."
@@ -19,22 +23,23 @@ checkconfig() {
 		eerror "    emerge --config dev-db/postgresql-server:@SLOT@"
 		return 1
 	fi
-	if [ ! -f ${PGDATA%/}/postgresql.conf -o \
-		! -f ${PGDATA%/}/pg_hba.conf -o ! -f ${PGDATA%/}/pg_ident.conf ] ; then
+	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
+		if [ ! -f ${PGDATA}/postgresql.conf ] ; then
 			eerror "    postgresql.conf"
 		fi
-		if [ ! -f ${PGDATA%/}/pg_hba.conf ] ; then
+		if [ ! -f ${PGDATA}/pg_hba.conf ] ; then
 			eerror "    pg_hba.conf"
 		fi
-		if [ ! -f ${PGDATA%/}/pg_ident.conf ] ; then
+		if [ ! -f ${PGDATA}/pg_ident.conf ] ; then
 			eerror "    pg_ident.conf"
 		fi
 		eerror  "HINT: Try:"
-		eerror "mv ${DATA_DIR%/}/*.conf ${PGDATA}"
+		eerror "mv ${DATA_DIR}/*.conf ${PGDATA}"
 		return 1
 	fi
+
 	if [ -e /var/run/postgresql/.s.PGSQL.${PGPORT} ] ; then
 		eerror "Socket conflict."
 		eerror "A server is already listening on:"
@@ -49,8 +54,8 @@ start() {
 
 	ebegin "Starting PostgreSQL"
 
-	if [ -f ${DATA_DIR%/}/postmaster.pid ] ; then
-		rm -f ${DATA_DIR%/}/postmaster.pid
+	if [ -f ${DATA_DIR}/postmaster.pid ] ; then
+		rm -f ${DATA_DIR}/postmaster.pid
 	fi
 
 	local retval
@@ -71,7 +76,7 @@ start() {
 	# The following is to catch the case of an already running server
 	# in which pg_ctl doesn't know to which server it connected to and
 	# falsely reports the server as 'up'
-	if [ ! -f ${DATA_DIR%/}/postmaster.pid ] ; then
+	if [ ! -f ${DATA_DIR}/postmaster.pid ] ; then
 		eerror "The PID file doesn't exist but pg_ctl reported a running server."
 		eerror "Please check whether there is another server running on the same port or read the log-file."
 		eend 1