Skip to content

Commit 3d3d7fa

Browse files
authored
Merge branch 'develop' into automate-flake-updates
2 parents 13713ca + 833a9e7 commit 3d3d7fa

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

  • ansible/files/admin_api_scripts/pg_upgrade_scripts

ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ EOF
212212

213213
function initiate_upgrade {
214214
mkdir -p "$MOUNT_POINT"
215-
SHARED_PRELOAD_LIBRARIES=$(cat "$POSTGRES_CONFIG_PATH" | grep shared_preload_libraries | sed "s/shared_preload_libraries =\s\{0,1\}'\(.*\)'.*/\1/")
215+
SHARED_PRELOAD_LIBRARIES=$(grep '^[[:space:]]*shared_preload_libraries' "$POSTGRES_CONFIG_PATH" | sed "s/shared_preload_libraries =\s\{0,1\}'\(.*\)'.*/\1/")
216216

217217
# Wrappers officially launched in PG15; PG14 version is incompatible
218218
if [[ "$OLD_PGVERSION" =~ 14* ]]; then
@@ -241,7 +241,7 @@ function initiate_upgrade {
241241
SHARED_PRELOAD_LIBRARIES=$(echo "$SHARED_PRELOAD_LIBRARIES" | sed "s/.$//" | xargs)
242242
fi
243243

244-
PGDATAOLD=$(cat "$POSTGRES_CONFIG_PATH" | grep data_directory | sed "s/data_directory = '\(.*\)'.*/\1/")
244+
PGDATAOLD=$(grep '^[[:space:]]*data_directory' "$POSTGRES_CONFIG_PATH" | sed "s/data_directory = '\(.*\)'.*/\1/")
245245

246246
# Check if old cluster has data checksums enabled
247247
CHECKSUM_VERSION=$("$PGBINOLD/pg_controldata" "$PGDATAOLD" | grep -i checksum | awk '{print $NF}')

0 commit comments

Comments
 (0)