From 46f39729cdac77ce7a0af9ce23fccf2bafa77da2 Mon Sep 17 00:00:00 2001
From: Ray Eldath <ray.eldath@outlook.com>
Date: Mon, 18 Mar 2024 18:50:06 +0800
Subject: [PATCH] Revert #201 partially (#386)

Current greenplum_path.sh is a result of #201 to make greenplum_path.sh
always using the Python during ./configure. But it inadvertently changes
user's $PATH. This portion of #201 is reverted, and it should be fine if
user use pip install --user to install dependencies.
---
 gpMgmt/Makefile                       | 1 -
 gpMgmt/bin/generate-greenplum-path.sh | 7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/gpMgmt/Makefile b/gpMgmt/Makefile
index b94f67c195c..372dae8ed46 100644
--- a/gpMgmt/Makefile
+++ b/gpMgmt/Makefile
@@ -9,7 +9,6 @@ $(recurse)
 generate_greenplum_path_file:
 	mkdir -p $(DESTDIR)$(prefix)
 	unset LIBPATH; \
-	export WHICHPYTHON=$(PYTHON); \
 	bin/generate-greenplum-path.sh > $(DESTDIR)$(prefix)/greenplum_path.sh
 
 install: generate_greenplum_path_file
diff --git a/gpMgmt/bin/generate-greenplum-path.sh b/gpMgmt/bin/generate-greenplum-path.sh
index 70eeb48f5cf..25e60065337 100755
--- a/gpMgmt/bin/generate-greenplum-path.sh
+++ b/gpMgmt/bin/generate-greenplum-path.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 cat <<"EOF"
-#!/usr/bin/env bash
 if test -n "${ZSH_VERSION:-}"; then
     # zsh
     SCRIPT_PATH="${(%):-%x}"
@@ -27,13 +26,9 @@ else
 fi
 EOF
 
-cat <<EOF
-PYTHONBINDIR="$(dirname "${WHICHPYTHON}")"
-EOF
-
 cat <<"EOF"
 PYTHONPATH="${GPHOME}/lib/python"
-PATH="${GPHOME}/bin:${PYTHONBINDIR}:${PATH}"
+PATH="${GPHOME}/bin:${PATH}"
 LD_LIBRARY_PATH="${GPHOME}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
 
 if [ -e "${GPHOME}/etc/openssl.cnf" ]; then