Thu Sep 29 23:14:32 UTC 2011

1 files changed, 7 insertions, 3 deletions

diff --git a/extra/postgresql/postgresql.install b/extra/postgresql/postgresql.install
index d65bb6a7f..c52432271 100644
--- a/extra/postgresql/postgresql.install
+++ b/extra/postgresql/postgresql.install
@@ -12,11 +12,15 @@ post_upgrade() {
   # FS#23858, fix postgres user shell issue
   postgres_shell=$(getent passwd postgres | cut -d: -f7)
   if [ "$postgres_shell" = "/sbin/nologin" ]; then
-	  chsh -s /bin/bash postgres
+    chsh -s /bin/bash postgres
   fi
 }
 
 post_remove() {
-  getent passwd postgres >/dev/null && userdel postgres
-  getent group postgres >/dev/null && groupdel postgres
+  if getent passwd postgres >/dev/null; then
+    userdel postgres
+  fi
+  if getent group postgres >/dev/null; then
+    groupdel postgres
+  fi
 }