Make whitespace of CI scripts consistent

.github/workflows/pgindent.yml

@@ -12,7 +12,6 @@ jobs:
     name: Check
     runs-on: ubuntu-22.04
     steps:
-
       - name: Clone repository
         uses: actions/checkout@v4
         with:
@@ -30,5 +29,3 @@ jobs:
     
       - name: Run pgindent
         run: ci_scripts/run-pgindent.sh --check --diff
-            
-

.github/workflows/psp-matrix.yml

@@ -16,4 +16,4 @@ jobs:
         os: ${{ matrix.os }}
         build_type: ${{ matrix.build_type }}
         build_script: ${{ matrix.build_script }}
-    secrets: inherit
+    secrets: inherit

.github/workflows/psp-reusable.yml

@@ -20,7 +20,6 @@ jobs:
     name: Build PSP
     runs-on: ${{ inputs.os }}
     steps:
-
       - name: Clone repository
         uses: actions/checkout@v4
         with:
@@ -89,8 +88,7 @@ jobs:
     if: inputs.build_script == 'make'
     needs: build
 
-    steps: 
+    steps:
-      
       - name: Download build artifacts
         uses: actions/download-artifact@v4
         with:
@@ -120,4 +118,4 @@ jobs:
             src/contrib/*/results
             src/contrib/*/regression.diffs
             src/contrib/*/regression.out
-          retention-days: 3
+          retention-days: 3

ci_scripts/dump-typedefs.sh

@@ -1,4 +1,4 @@
-SCRIPT_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
 cd "$SCRIPT_DIR/../"
 
 if ! test -f src/backend/postgres; then
@@ -28,5 +28,4 @@ objdump -W contrib/pg_tde/pg_tde.so |\
     sort | uniq > tde.typedefs
 
 # Combine with original typedefs
-
 cat percona.typedefs tde.typedefs src/tools/pgindent/typedefs.list | sort | uniq > combined.typedefs

ci_scripts/make-build.sh

@@ -2,10 +2,9 @@
 
 export TDE_MODE=1
 
-SCRIPT_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
 INSTALL_DIR="$SCRIPT_DIR/../../pginst"
 
-
 cd "$SCRIPT_DIR/../"
 
 if [ "$1" = "debugoptimized" ]; then
@@ -15,4 +14,3 @@ fi
 
 ./configure --enable-debug --enable-cassert --enable-tap-tests --prefix=$INSTALL_DIR
 make install-world -j
-

ci_scripts/make-test-tde.sh

@@ -2,7 +2,7 @@
 
 export TDE_MODE=1
 
-SCRIPT_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
 INSTALL_DIR="$SCRIPT_DIR/../../pginst"
 
 cd "$SCRIPT_DIR/../"
@@ -42,4 +42,4 @@ if [ "$1" = "--continue" ]; then
     ADD_FLAGS="-k"
 fi
 
-EXTRA_REGRESS_OPTS="--extra-setup=$SCRIPT_DIR/tde_setup.sql --load-extension=pg_tde" make installcheck-world $ADD_FLAGS
+EXTRA_REGRESS_OPTS="--extra-setup=$SCRIPT_DIR/tde_setup.sql --load-extension=pg_tde" make installcheck-world $ADD_FLAGS

ci_scripts/make-test.sh

@@ -2,10 +2,9 @@
 
 export TDE_MODE=1
 
-SCRIPT_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P)"
 INSTALL_DIR="$SCRIPT_DIR/../../pginst"
 
 cd "$SCRIPT_DIR/../"
 
 make check-world
-

ci_scripts/meson-build.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-SCRIPT_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
 
 cd "$SCRIPT_DIR/../"
 
 meson setup build --prefix `pwd`/../pginst --buildtype=$1 -Dcassert=true -Dtap_tests=enabled
-cd build && ninja && ninja install
+cd build && ninja && ninja install

ci_scripts/meson-test-tde.sh

@@ -1 +1 @@
-# Nop for now: meson doesn't have EXTRA_REGRESS_OPTS
+# Nop for now: meson doesn't have EXTRA_REGRESS_OPTS

ci_scripts/meson-test.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-SCRIPT_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
 
 cd "$SCRIPT_DIR/../build"
 
-meson test
+meson test

ci_scripts/run-pgindent.sh

@@ -1,5 +1,4 @@
-
+SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
-SCRIPT_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
 INSTALL_DIR="$SCRIPT_DIR/../../pginst"
 cd "$SCRIPT_DIR/../"
 
@@ -13,7 +12,6 @@ make install
 
 cd "$SCRIPT_DIR/../"
 
-
 export PATH=$SCRIPT_DIR/../src/tools/pgindent/:$INSTALL_DIR/bin/:$PATH
 
-pgindent --typedefs=combined.typedefs "$@" .
+pgindent --typedefs=combined.typedefs "$@" .

ci_scripts/setup-keyring-servers.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-SCRIPT_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
 
 cd /tmp
 
@@ -23,5 +23,5 @@ sleep 10
 export ROOT_TOKEN=$(cat $TV | grep "Root Token" | cut -d ":" -f 2 | xargs echo -n)
 echo "export ROOT_TOKEN=$ROOT_TOKEN"
 if [ -v GITHUB_ACTIONS ]; then
-    echo "ROOT_TOKEN=$ROOT_TOKEN"  >> $GITHUB_ENV
+    echo "ROOT_TOKEN=$ROOT_TOKEN" >> $GITHUB_ENV
 fi

ci_scripts/tde_setup.sql

@@ -1,3 +1,3 @@
 CREATE EXTENSION IF NOT EXISTS pg_tde;
 SELECT pg_tde_add_key_provider_file('reg_file-vault', '/tmp/pg_tde_test_keyring.per');
-SELECT pg_tde_set_principal_key('test-db-principal-key', 'reg_file-vault');
+SELECT pg_tde_set_principal_key('test-db-principal-key', 'reg_file-vault');

ci_scripts/tde_setup_global.sql

@@ -3,4 +3,4 @@ SELECT pg_tde_add_key_provider_file('PG_TDE_GLOBAL', 'reg_file-global', '/tmp/pg
 SELECT pg_tde_set_server_principal_key('global-principal-key', 'PG_TDE_GLOBAL', 'reg_file-global');
 SELECT pg_tde_create_wal_key();
 ALTER SYSTEM SET default_table_access_method='tde_heap';
--- restart required
+-- restart required

ci_scripts/ubuntu-deps.sh

@@ -7,7 +7,6 @@ sudo apt install -y libreadline6-dev systemtap-sdt-dev zlib1g-dev libssl-dev lib
 bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 
 # Perl test dependencies
-
 sudo apt install -y libipc-run-perl python3-pykmip libhttp-server-simple-perl
 
 sudo /usr/bin/perl -MCPAN -e 'install IPC::Run'
@@ -16,4 +15,4 @@ sudo /usr/bin/perl -MCPAN -e 'install Text::Trim'
 # Vault
 wget -O- https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
 echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
-sudo apt update && sudo apt install -y vault
+sudo apt update && sudo apt install -y vault