Fix NO_CLUSTER usage

.github/workflows/cicd.yml

@@ -34,13 +34,7 @@ jobs:
         run: "docker run -w /repo --rm --volume \"$(pwd)/test:/repo\" pgxn-tools-test ./runtest.sh ${{ matrix.pg }} zip yes"
       # Test NO_CLUSTER
       - name: Test NO_CLUSTER
-        env: { NO_CLUSTER: true }
-        run: |-
-          docker run -w /repo --rm pgxn-tools-test pg-start ${{ matrix.pg }}
-          if [ -d /var/lib/postgresql/16/test ]; then
-            echo "ERROR: /var/lib/postgresql/16/test should not exist!"
-            exit 1;
-          fi
+        run: "docker run -w /repo -e NO_CLUSTER=1 --rm --volume \"$(pwd):/repo\" pgxn-tools-test ./test/no_cluster_test.sh ${{ matrix.pg }}"
 
   publish:
     # Publish for a tag starting with v.

bin/pg-start

@@ -15,8 +15,15 @@ PGVERSION=${1:-}
 
 set -x
 sudo apt.postgresql.org.sh -i -v "$PGVERSION"
+set +x
 if [ $# -gt 1 ]; then
+set -x
     sudo apt-get -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install -y "${@:2}"
 fi
 
-[ -z ${NO_CLUSTER+x} ] && sudo pg_createcluster --start "$PGVERSION" test -p "${PGPORT:-5432}" -- -A trust
+set +x
+if [ -z ${NO_CLUSTER+x} ]; then
+    set -x
+    sudo pg_createcluster --start "$PGVERSION" test -p "${PGPORT:-5432}" -- -A trust
+fi
+set -x

test/no_cluster_test.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+pgversion=$1
+if ! pg-start "$pgversion"; then
+    echo "ERROR: error returned from script"
+    exit 1
+fi
+
+if [ -d "/var/lib/postgresql/$pgversion/test" ]; then
+  echo "ERROR: /var/lib/postgresql/$pgversion/test should not exist!"
+  exit 1;
+fi