Skip to content

Commit 75f6d24

Browse files
authored
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.
1 parent 7f5f30f commit 75f6d24

2 files changed

Lines changed: 1 addition & 7 deletions

File tree

gpMgmt/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ $(recurse)
99
generate_greenplum_path_file:
1010
mkdir -p $(DESTDIR)$(prefix)
1111
unset LIBPATH; \
12-
export WHICHPYTHON=$(PYTHON); \
1312
bin/generate-greenplum-path.sh > $(DESTDIR)$(prefix)/greenplum_path.sh
1413

1514
install: generate_greenplum_path_file

gpMgmt/bin/generate-greenplum-path.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/usr/bin/env bash
22

33
cat <<"EOF"
4-
#!/usr/bin/env bash
54
if test -n "${ZSH_VERSION:-}"; then
65
# zsh
76
SCRIPT_PATH="${(%):-%x}"
@@ -27,13 +26,9 @@ else
2726
fi
2827
EOF
2928

30-
cat <<EOF
31-
PYTHONBINDIR="$(dirname "${WHICHPYTHON}")"
32-
EOF
33-
3429
cat <<"EOF"
3530
PYTHONPATH="${GPHOME}/lib/python"
36-
PATH="${GPHOME}/bin:${PYTHONBINDIR}:${PATH}"
31+
PATH="${GPHOME}/bin:${PATH}"
3732
LD_LIBRARY_PATH="${GPHOME}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
3833
3934
if [ -e "${GPHOME}/etc/openssl.cnf" ]; then

0 commit comments

Comments
 (0)