# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1297798492 0
# Node ID 0731792c39945cc0de80fc5c762bfec1625805af
# Parent  6d8cff5d29ea587a42bcb1b81fa34d168248ea55
Fixed postgresqlclient post_remove. Its also using .files-list files directly now. So sources will not take up space on tank.

diff -r 6d8cff5d29ea -r 0731792c3994 libpostgresqlclient/receipt
--- a/libpostgresqlclient/receipt	Tue Feb 15 18:03:31 2011 +0000
+++ b/libpostgresqlclient/receipt	Tue Feb 15 19:34:52 2011 +0000
@@ -15,7 +15,7 @@
 		dir=$(dirname $file)
 		[ -d $fs$dir ] || mkdir -p $fs$dir
 		cp -a $_pkg$file $fs$file
-	done < $src/$PACKAGE.files-list
+	done < $WOK/$WANTED/stuff/$PACKAGE.files-list
 	strip -s $fs/usr/lib/postgresql/*.so*
 	ln -s /usr/lib/postgresql/libpq.so.5 $fs/usr/lib/libpq.so.5
 }
diff -r 6d8cff5d29ea -r 0731792c3994 postgresql-client/receipt
--- a/postgresql-client/receipt	Tue Feb 15 18:03:31 2011 +0000
+++ b/postgresql-client/receipt	Tue Feb 15 19:34:52 2011 +0000
@@ -17,6 +17,6 @@
 		dir=$(dirname $file)
 		[ -d $fs$dir ] || mkdir -p $fs$dir
 		cp -a $_pkg$file $fs$file
-	done < $src/$PACKAGE.files-list
+	done < $WOK/$WANTED/stuff/$PACKAGE.files-list
 }
 
diff -r 6d8cff5d29ea -r 0731792c3994 postgresql/receipt
--- a/postgresql/receipt	Tue Feb 15 18:03:31 2011 +0000
+++ b/postgresql/receipt	Tue Feb 15 19:34:52 2011 +0000
@@ -43,27 +43,29 @@
 	cp -a stuff/etc $fs
 	ln -s /var/lib/pgsql/postgresql.conf $fs/etc
 	chmod 700 $fs/var/lib/pgsql
-	cat $src/*.files-list | while read file; do
+	cat $WOK/$PACKAGE/stuff/*.files-list | while read file; do
 		[ -f $fs$file ] && rm -f $fs$file
 	done
+
 }
 
 # Pre and post install commands for Tazpkg.
 post_install()
 {
         # adduser postgres if needed
-	if ! grep -q postgres $1/etc/passwd; then
+	if ! grep -q postgres: $1/etc/passwd; then
 		echo -n "Adding user postgres..."
 		chroot $1/ adduser postgres -D -H -u 88 -h /var/lib/pgsql
-		rm -f /var/lib/pgsql/.* /var/lib/pgsql/*
+		#[ -d $1/var/lib/pgsql ] && rm -f $1/var/lib/pgsql/.* $1/var/lib/pgsql/*
 		status
 	fi
 	# addgroup postgres if needed
-	if ! grep -q postgres $1/etc/group; then
+	if ! grep -q postgres: $1/etc/group; then
 		echo -n "Adding group postgres..."
-		chroot $1/ sh -c 'addgroup -g 88 postgres && addgroup postgres postgres'
+		chroot $1/ sh -c 'addgroup -g 88 postgres'
 		status
 	fi
+	[ ! -d $1/var/lib/pgsql ] && mkdir -p $1/var/lib/pgsql
 	chroot $1/ chown -R postgres.postgres /var/lib/pgsql /var/log/postgresql
 	cat <<EOF
 ----
@@ -80,6 +82,7 @@
 
 post_remove()
 {
+	# when both user and group have the same id# and name
+	# both group and user will get removed with either delusr/delgroup
 	chroot $1/ deluser postgres
-	chroot $1/ delgroup postgres
 }