Skip to content

Commit

Permalink
Revert apache#201 partially (apache#386)
Browse files Browse the repository at this point in the history
Current greenplum_path.sh is a result of apache#201 to make greenplum_path.sh
always using the Python during ./configure. But it inadvertently changes
user's $PATH. This portion of apache#201 is reverted, and it should be fine if
user use pip install --user to install dependencies.
  • Loading branch information
Ray-Eldath authored and my-ship-it committed Mar 19, 2024
1 parent 8f457c1 commit 46f3972
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
1 change: 0 additions & 1 deletion gpMgmt/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions gpMgmt/bin/generate-greenplum-path.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/usr/bin/env bash

cat <<"EOF"
#!/usr/bin/env bash
if test -n "${ZSH_VERSION:-}"; then
# zsh
SCRIPT_PATH="${(%):-%x}"
Expand All @@ -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
Expand Down

0 comments on commit 46f3972

Please sign in to comment.