mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Be more paranoid about quoting in pg_upgrade's test script.

Browse Source 
Double-quote $PGDATA in "find" commands introduced by commit da9b580d8,
in case that path contains spaces or other special characters.

Adjust a few other places so that quoting is done more consistently.
None of the others are actual bugs AFAICS, but it's confusing to readers
if the same thing is done differently in different places.

Noted by Tels.

Discussion: https://postgr.es/m/c96303c04c360bbedaa04f90f515745b.squirrel@sm.webmail.pair.com
This commit is contained in:
Tom Lane 2018-07-21 12:05:25 -04:00
parent 986127e3db
commit 0c0908d926
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/pg_upgrade/test.sh
View File

@ -65,7 +65,7 @@ case $testhost in
;; ;;
esac esac
POSTMASTER_OPTS="-F -c listen_addresses=$LISTEN_ADDRESSES -k \"$PGHOST\"" POSTMASTER_OPTS="-F -c listen_addresses=\"$LISTEN_ADDRESSES\" -k \"$PGHOST\""
export PGHOST export PGHOST
# don't rely on $PWD here, as old shells don't set it # don't rely on $PWD here, as old shells don't set it
@ -107,8 +107,8 @@ newsrc=`cd ../../.. && pwd`
PATH=$bindir:$PATH PATH=$bindir:$PATH
export PATH export PATH
BASE_PGDATA=$temp_root/data BASE_PGDATA="$temp_root/data"
PGDATA="$BASE_PGDATA.old" PGDATA="${BASE_PGDATA}.old"
export PGDATA export PGDATA
rm -rf "$BASE_PGDATA" "$PGDATA" rm -rf "$BASE_PGDATA" "$PGDATA"
@ -224,17 +224,17 @@ if [ -n "$pg_dumpall1_status" ]; then
exit 1 exit 1
fi fi
PGDATA=$BASE_PGDATA PGDATA="$BASE_PGDATA"
standard_initdb 'initdb' standard_initdb 'initdb'
pg_upgrade $PG_UPGRADE_OPTS -d "${PGDATA}.old" -D "${PGDATA}" -b "$oldbindir" -B "$bindir" -p "$PGPORT" -P "$PGPORT" pg_upgrade $PG_UPGRADE_OPTS -d "${PGDATA}.old" -D "$PGDATA" -b "$oldbindir" -B "$bindir" -p "$PGPORT" -P "$PGPORT"
# make sure all directories and files have group permissions, on Unix hosts # make sure all directories and files have group permissions, on Unix hosts
# Windows hosts don't support Unix-y permissions. # Windows hosts don't support Unix-y permissions.
case $testhost in case $testhost in
MINGW*) ;; MINGW*) ;;
*) if [ `find ${PGDATA} -type f ! -perm 640 | wc -l` -ne 0 ]; then *) if [ `find "$PGDATA" -type f ! -perm 640 | wc -l` -ne 0 ]; then
echo "files in PGDATA with permission != 640"; echo "files in PGDATA with permission != 640";
exit 1; exit 1;
fi ;; fi ;;
@ -242,7 +242,7 @@ esac
case $testhost in case $testhost in
MINGW*) ;; MINGW*) ;;
*) if [ `find ${PGDATA} -type d ! -perm 750 | wc -l` -ne 0 ]; then *) if [ `find "$PGDATA" -type d ! -perm 750 | wc -l` -ne 0 ]; then
echo "directories in PGDATA with permission != 750"; echo "directories in PGDATA with permission != 750";
exit 1; exit 1;
fi ;; fi ;;