CVS commit: pkgsrc/databases

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Sep 16 12:09:59 UTC 2024

Modified Files:
        pkgsrc/databases/postgresql12-server/files: pgsql.sh
        pkgsrc/databases/postgresql13-server/files: pgsql.sh
        pkgsrc/databases/postgresql14-server/files: pgsql.sh
        pkgsrc/databases/postgresql15-server/files: pgsql.sh
        pkgsrc/databases/postgresql16-server/files: pgsql.sh

Log Message:
postgresql1*: cleanup rc scripts


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql12-server/files/pgsql.sh
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql13-server/files/pgsql.sh
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql14-server/files/pgsql.sh
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql15-server/files/pgsql.sh
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/postgresql16-server/files/pgsql.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/postgresql12-server/files/pgsql.sh
diff -u pkgsrc/databases/postgresql12-server/files/pgsql.sh:1.2 pkgsrc/databases/postgresql12-server/files/pgsql.sh:1.3
--- pkgsrc/databases/postgresql12-server/files/pgsql.sh:1.2     Fri Feb  9 08:33:13 2024
+++ pkgsrc/databases/postgresql12-server/files/pgsql.sh Mon Sep 16 12:09:59 2024
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: pgsql.sh,v 1.2 2024/02/09 08:33:13 adam Exp $
+# $NetBSD: pgsql.sh,v 1.3 2024/09/16 12:09:59 adam Exp $
 #
 # PostgreSQL database rc.d control script
 #
@@ -40,9 +40,7 @@ restart_cmd="pgsql_restart"
 stop_cmd="pgsql_stop"
 reload_cmd="pgsql_reload"
 
-if [ -f @SYSCONFBASE@/rc.subr ] && \
-   [ -d @SYSCONFBASE@/rc.d ] && \
-   [ -f @SYSCONFBASE@/rc.d/DAEMON ]; then
+if [ -f @SYSCONFBASE@/rc.subr -a -d @SYSCONFBASE@/rc.d -a -f @SYSCONFBASE@/rc.d/DAEMON ]; then
        load_rc_config $name
 elif [ -f @SYSCONFBASE@/rc.conf ]; then
        . @SYSCONFBASE@/rc.conf
@@ -103,9 +101,7 @@ pgsql_reload()
        @SU@ -m ${pgsql_user} -c "${command} reload ${command_args_daemon}"
 }
 
-if [ -f @SYSCONFBASE@/rc.subr ] && \
-   [ -d @SYSCONFBASE@/rc.d ] && \
-   [ -f @SYSCONFBASE@/rc.d/DAEMON ]; then
+if [ -f @SYSCONFBASE@/rc.subr -a -d @SYSCONFBASE@/rc.d -a -f @SYSCONFBASE@/rc.d/DAEMON ]; then
        run_rc_command "$1"
 else
        pidfile="${pgsql_home}/data/postmaster.pid"

Index: pkgsrc/databases/postgresql13-server/files/pgsql.sh
diff -u pkgsrc/databases/postgresql13-server/files/pgsql.sh:1.2 pkgsrc/databases/postgresql13-server/files/pgsql.sh:1.3
--- pkgsrc/databases/postgresql13-server/files/pgsql.sh:1.2     Fri Feb  9 08:33:14 2024
+++ pkgsrc/databases/postgresql13-server/files/pgsql.sh Mon Sep 16 12:09:59 2024
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: pgsql.sh,v 1.2 2024/02/09 08:33:14 adam Exp $
+# $NetBSD: pgsql.sh,v 1.3 2024/09/16 12:09:59 adam Exp $
 #
 # PostgreSQL database rc.d control script
 #
@@ -40,9 +40,7 @@ restart_cmd="pgsql_restart"
 stop_cmd="pgsql_stop"
 reload_cmd="pgsql_reload"
 
-if [ -f @SYSCONFBASE@/rc.subr ] && \
-   [ -d @SYSCONFBASE@/rc.d ] && \
-   [ -f @SYSCONFBASE@/rc.d/DAEMON ]; then
+if [ -f @SYSCONFBASE@/rc.subr -a -d @SYSCONFBASE@/rc.d -a -f @SYSCONFBASE@/rc.d/DAEMON ]; then
        load_rc_config $name
 elif [ -f @SYSCONFBASE@/rc.conf ]; then
        . @SYSCONFBASE@/rc.conf
@@ -103,9 +101,7 @@ pgsql_reload()
        @SU@ -m ${pgsql_user} -c "${command} reload ${command_args_daemon}"
 }
 
-if [ -f @SYSCONFBASE@/rc.subr ] && \
-   [ -d @SYSCONFBASE@/rc.d ] && \
-   [ -f @SYSCONFBASE@/rc.d/DAEMON ]; then
+if [ -f @SYSCONFBASE@/rc.subr -a -d @SYSCONFBASE@/rc.d -a -f @SYSCONFBASE@/rc.d/DAEMON ]; then
        run_rc_command "$1"
 else
        pidfile="${pgsql_home}/data/postmaster.pid"

Index: pkgsrc/databases/postgresql14-server/files/pgsql.sh
diff -u pkgsrc/databases/postgresql14-server/files/pgsql.sh:1.3 pkgsrc/databases/postgresql14-server/files/pgsql.sh:1.4
--- pkgsrc/databases/postgresql14-server/files/pgsql.sh:1.3     Fri Feb  9 08:33:14 2024
+++ pkgsrc/databases/postgresql14-server/files/pgsql.sh Mon Sep 16 12:09:59 2024
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: pgsql.sh,v 1.3 2024/02/09 08:33:14 adam Exp $
+# $NetBSD: pgsql.sh,v 1.4 2024/09/16 12:09:59 adam Exp $
 #
 # PostgreSQL database rc.d control script
 #
@@ -40,9 +40,7 @@ restart_cmd="pgsql_restart"
 stop_cmd="pgsql_stop"
 reload_cmd="pgsql_reload"
 
-if [ -f @SYSCONFBASE@/rc.subr ] && \
-   [ -d @SYSCONFBASE@/rc.d ] && \
-   [ -f @SYSCONFBASE@/rc.d/DAEMON ]; then
+if [ -f @SYSCONFBASE@/rc.subr -a -d @SYSCONFBASE@/rc.d -a -f @SYSCONFBASE@/rc.d/DAEMON ]; then
        load_rc_config $name
 elif [ -f @SYSCONFBASE@/rc.conf ]; then
        . @SYSCONFBASE@/rc.conf
@@ -103,9 +101,7 @@ pgsql_reload()
        @SU@ -m ${pgsql_user} -c "${command} reload ${command_args_daemon}"
 }
 
-if [ -f @SYSCONFBASE@/rc.subr ] && \
-   [ -d @SYSCONFBASE@/rc.d ] && \
-   [ -f @SYSCONFBASE@/rc.d/DAEMON ]; then
+if [ -f @SYSCONFBASE@/rc.subr -a -d @SYSCONFBASE@/rc.d -a -f @SYSCONFBASE@/rc.d/DAEMON ]; then
        run_rc_command "$1"
 else
        pidfile="${pgsql_home}/data/postmaster.pid"

Index: pkgsrc/databases/postgresql15-server/files/pgsql.sh
diff -u pkgsrc/databases/postgresql15-server/files/pgsql.sh:1.2 pkgsrc/databases/postgresql15-server/files/pgsql.sh:1.3
--- pkgsrc/databases/postgresql15-server/files/pgsql.sh:1.2     Fri Feb  9 08:33:15 2024
+++ pkgsrc/databases/postgresql15-server/files/pgsql.sh Mon Sep 16 12:09:59 2024
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: pgsql.sh,v 1.2 2024/02/09 08:33:15 adam Exp $
+# $NetBSD: pgsql.sh,v 1.3 2024/09/16 12:09:59 adam Exp $
 #
 # PostgreSQL database rc.d control script
 #
@@ -40,9 +40,7 @@ restart_cmd="pgsql_restart"
 stop_cmd="pgsql_stop"
 reload_cmd="pgsql_reload"
 
-if [ -f @SYSCONFBASE@/rc.subr ] && \
-   [ -d @SYSCONFBASE@/rc.d ] && \
-   [ -f @SYSCONFBASE@/rc.d/DAEMON ]; then
+if [ -f @SYSCONFBASE@/rc.subr -a -d @SYSCONFBASE@/rc.d -a -f @SYSCONFBASE@/rc.d/DAEMON ]; then
        load_rc_config $name
 elif [ -f @SYSCONFBASE@/rc.conf ]; then
        . @SYSCONFBASE@/rc.conf
@@ -103,9 +101,7 @@ pgsql_reload()
        @SU@ -m ${pgsql_user} -c "${command} reload ${command_args_daemon}"
 }
 
-if [ -f @SYSCONFBASE@/rc.subr ] && \
-   [ -d @SYSCONFBASE@/rc.d ] && \
-   [ -f @SYSCONFBASE@/rc.d/DAEMON ]; then
+if [ -f @SYSCONFBASE@/rc.subr -a -d @SYSCONFBASE@/rc.d -a -f @SYSCONFBASE@/rc.d/DAEMON ]; then
        run_rc_command "$1"
 else
        pidfile="${pgsql_home}/data/postmaster.pid"

Index: pkgsrc/databases/postgresql16-server/files/pgsql.sh
diff -u pkgsrc/databases/postgresql16-server/files/pgsql.sh:1.3 pkgsrc/databases/postgresql16-server/files/pgsql.sh:1.4
--- pkgsrc/databases/postgresql16-server/files/pgsql.sh:1.3     Thu Dec 14 11:46:43 2023
+++ pkgsrc/databases/postgresql16-server/files/pgsql.sh Mon Sep 16 12:09:59 2024
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: pgsql.sh,v 1.3 2023/12/14 11:46:43 adam Exp $
+# $NetBSD: pgsql.sh,v 1.4 2024/09/16 12:09:59 adam Exp $
 #
 # PostgreSQL database rc.d control script
 #
@@ -40,9 +40,7 @@ restart_cmd="pgsql_restart"
 stop_cmd="pgsql_stop"
 reload_cmd="pgsql_reload"
 
-if [ -f @SYSCONFBASE@/rc.subr ] && \
-   [ -d @SYSCONFBASE@/rc.d ] && \
-   [ -f @SYSCONFBASE@/rc.d/DAEMON ]; then
+if [ -f @SYSCONFBASE@/rc.subr -a -d @SYSCONFBASE@/rc.d -a -f @SYSCONFBASE@/rc.d/DAEMON ]; then
        load_rc_config $name
 elif [ -f @SYSCONFBASE@/rc.conf ]; then
        . @SYSCONFBASE@/rc.conf
@@ -103,9 +101,7 @@ pgsql_reload()
        @SU@ -m ${pgsql_user} -c "${command} reload ${command_args_daemon}"
 }
 
-if [ -f @SYSCONFBASE@/rc.subr ] && \
-   [ -d @SYSCONFBASE@/rc.d ] && \
-   [ -f @SYSCONFBASE@/rc.d/DAEMON ]; then
+if [ -f @SYSCONFBASE@/rc.subr -a -d @SYSCONFBASE@/rc.d -a -f @SYSCONFBASE@/rc.d/DAEMON ]; then
        run_rc_command "$1"
 else
        pidfile="${pgsql_home}/data/postmaster.pid"