From a6c857bcb4472ee5b19f01d325336de86b401bec Mon Sep 17 00:00:00 2001
From: Yogesh Sharma <yogesh.sharma@catprosystems.com>
Date: Wed, 10 Jan 2024 12:14:53 -0500
Subject: [PATCH] - Fix errors for zsh commands - Check for DIR presence before
 running a command - add support for pgconfdigs folder - Update README

---
 README.md |  6 ++++++
 pg-env    | 17 +++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 903d6e8..2d1bc35 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,12 @@
 | PG_INST_NAME | <PG_DEV_NAME>-INST | Name of the install folder |
 | PG_ENV_CFLAGS | | Extra CFLAGS |
 
+PostgreSQL extra configs shall be store in `${GIT_DIR}/pgconfigs/` in this naming convention:
+```
+pg${PGV}.conf
+pg${PGV}-<Cluster #>.conf
+```
+
 ### Advance setting for pg-env 
 
 | Config | Defaults | Description |
diff --git a/pg-env b/pg-env
index 5a9feb2..fc6dc60 100755
--- a/pg-env
+++ b/pg-env
@@ -112,21 +112,21 @@ compile_contrib() {
 
 startdb(){
   if [ -z "$1" ]; then
-    pg_ctl start
+    [ -d "${PGDATA}" ] && pg_ctl start
   else
     for NodeN in "$@"
     do
-      pg_ctl start -D ${PGDATA}-${NodeN}
+      [ -d "${PGDATA}-${NodeN}" ] && pg_ctl start -D ${PGDATA}-${NodeN}
     done
   fi
 }
 stopdb(){
   if [ -z "$1" ]; then
-  pg_ctl stop
+    [ -d "${PGDATA}" ] && pg_ctl stop
   else
     for NodeN in "$@"
     do
-      pg_ctl stop -D ${PGDATA}-${NodeN}
+      [ -d "${PGDATA}-${NodeN}" ] && pg_ctl stop -D ${PGDATA}-${NodeN}
     done
   fi
 }
@@ -138,12 +138,12 @@ restartdb(){
 
 cleandb(){
   if [ -z "$1" ]; then
-    setopt localoptions rmstarsilent
+    [ -n "$ZSH_VERSION" ] && setopt localoptions rmstarsilent
     rm -rf $PGDATA/*
   else
     for NodeN in "$@"
     do
-    setopt localoptions rmstarsilent
+      [ -n "$ZSH_VERSION" ] && setopt localoptions rmstarsilent
       rm -rf ${PGDATA}-${NodeN}/*
     done
   fi
@@ -151,11 +151,12 @@ cleandb(){
 setupdb(){
   if [ -z "$1" ]; then
     initdb --data-checksums --username=sharyogi
+    echo "include = '${GIT_DIR}/pgconfigs/pg${PGV}.conf'" >> ${PGDATA}-${NodeN}/postgresql.conf
   else
     for NodeN in "$@"
     do
       initdb --data-checksums --username=sharyogi -D ${PGDATA}-${NodeN}
-      echo "include = '../../pg${PGV}-${NodeN}.conf'" >> ${PGDATA}-${NodeN}/postgresql.conf
+      echo "include = '${GIT_DIR}/pgconfigs/pg${PGV}-${NodeN}.conf'" >> ${PGDATA}-${NodeN}/postgresql.conf
     done
   fi
 }
@@ -169,7 +170,7 @@ resetdb() {
 
 resetall() {
   stopdb "$@"
-  setopt localoptions rmstarsilent
+  [ -n "$ZSH_VERSION" ] && setopt localoptions rmstarsilent
   rm -rf $PG_DEV_INST/*
   distclean
   compile