diff --git a/postgresql-script b/postgresql-script index 2d2ecf4..9ae58b3 100644 --- a/postgresql-script +++ b/postgresql-script @@ -10,7 +10,7 @@ PIDFILE=$DATADIR/postmaster.pid # if test -r $DATADIR/PG_VERSION ; then DATA_VERSION=$(cat $DATADIR/PG_VERSION) - POSTGRES=/usr/lib/postgresql${DATA_VERSION/./}/bin/postgres + POSTGRES=/usr/lib/postgresql$(echo -n $DATA_VERSION | tr -d .)/bin/postgres fi if test -x /usr/bin/postgres; then ACTIVE=$(readlink -q -f /usr/bin/postgres) @@ -49,7 +49,7 @@ case "$1" in test -n "$POSTGRES_LANG" && export LC_ALL="$POSTGRES_LANG" install -d -m 700 ${DATADIR} && echo "Initializing PostgreSQL $VERSION at location ${DATADIR}" - /usr/bin/initdb --auth=ident $DATADIR &> initlog || { + /usr/bin/initdb --auth=ident $DATADIR > initlog 2>&1 || { echo "Initialisation failed. See $PWD/initlog ." exit 1 } diff --git a/postgresql.changes b/postgresql.changes index 3e22760..c7d4323 100644 --- a/postgresql.changes +++ b/postgresql.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Sep 5 13:12:41 UTC 2022 - Dirk Müller + +- avoid bashisms in /bin/sh based startup script + +------------------------------------------------------------------- +Sat May 21 15:11:15 UTC 2022 - Marcus Rueckert + +- Bump to postgresql 15 + ------------------------------------------------------------------- Wed Mar 16 14:50:22 UTC 2022 - Callum Farmer diff --git a/postgresql.spec b/postgresql.spec index 9b32df3..b8604f9 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define pgmajor 14 +%define pgmajor 15 %define defaultpackage postgresql%pgmajor %if ! %{defined _rpmmacrodir}