Skip to content

Install bootstrapped Python into php-buildpack specific location #864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 13, 2023
Merged

Install bootstrapped Python into php-buildpack specific location #864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/detect
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ BP=$(dirname "$(dirname "$0")")

# Install python if stack is cflinuxfs4 so its available during staging
if [ "$CF_STACK" == "cflinuxfs4" ]; then
PYTHON_DIR="/tmp/python"
PYTHON_DIR="/tmp/php-buildpack/python"
mkdir -p "${PYTHON_DIR}"
source "$BP/bin/install-python" "$PYTHON_DIR" "$BP" &> /dev/null

Expand Down
6 changes: 3 additions & 3 deletions bin/install-python
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ function main() {
local buildpack_dir="$2"
local python_dep_name=$(get_python_from_manifest "$buildpack_dir")

if [[ ! -d "/tmp/python/bin" ]]; then
if [[ ! -d "/tmp/php-buildpack/python/bin" ]]; then
setup_python "$python_dep_name" "$install_dir" "$buildpack_dir"
elif [[ $install_dir != "/tmp/python" ]]; then
cp -r "/tmp/python/." "$install_dir"
elif [[ $install_dir != "/tmp/php-buildpack/python" ]]; then
cp -r "/tmp/php-buildpack/python/." "$install_dir"
fi

export LD_LIBRARY_PATH="$install_dir/lib:${LD_LIBRARY_PATH:-}"
Expand Down
2 changes: 1 addition & 1 deletion bin/release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ BP=$(dirname "$(dirname "$0")")
# Install python if stack is cflinuxfs4 so its available during staging
# Install ruby if stack is cflinuxfs4 so its available during staging
if [ "$CF_STACK" == "cflinuxfs4" ]; then
PYTHON_DIR="/tmp/python"
PYTHON_DIR="/tmp/php-buildpack/python"
mkdir -p "${PYTHON_DIR}"
source "$BP/bin/install-python" "$PYTHON_DIR" "$BP" &> /dev/null

Expand Down