From 8d79e5e2857e3880d8fcc95c9a9f80b633bafa95 Mon Sep 17 00:00:00 2001 From: Kalen Krempely Date: Thu, 18 Jun 2020 12:42:45 -0700 Subject: [PATCH] demo_cluster.sh: remove GPSEARCH Use GPHOME directly. There is no need for GPSEARCH. This enables demo_cluster.sh to handle symlinks which is useful when GPDB is installed using RPMs and a demo cluster is desired. (cherry picked from commit 6932195ab2faa7fa5835e2c231314dabd3daf7bf) Co-authored-by: Jamie McAtamney --- gpAux/gpdemo/demo_cluster.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gpAux/gpdemo/demo_cluster.sh b/gpAux/gpdemo/demo_cluster.sh index d7b411fe77..0163dec1a3 100755 --- a/gpAux/gpdemo/demo_cluster.sh +++ b/gpAux/gpdemo/demo_cluster.sh @@ -162,8 +162,6 @@ if [ -z "${GPHOME}" ]; then echo " file in your Greenplum installation directory." echo "" exit 1 -else - GPSEARCH=$GPHOME fi cat <<-EOF @@ -194,16 +192,16 @@ cat <<-EOF EOF -GPPATH=`find $GPSEARCH -name gp_dump| tail -1` +GPPATH=`find -H $GPHOME -name gp_dump| tail -1` RETVAL=$? if [ "$RETVAL" -ne 0 ]; then - echo "Error attempting to find Greenplum executables in $GPSEARCH" + echo "Error attempting to find Greenplum executables in $GPHOME" exit 1 fi if [ ! -x "$GPPATH" ]; then - echo "No executables found for Greenplum installation in $GPSEARCH" + echo "No executables found for Greenplum installation in $GPHOME" exit 1 fi GPPATH=`dirname $GPPATH` -- GitLab