From 06a06a05f5c9a5e7d56c22581ee1c754738524f1 Mon Sep 17 00:00:00 2001
From: Brayan Henao <bhenao@vmware.com>
Date: Wed, 12 Apr 2023 16:37:20 -0400
Subject: [PATCH] Install bootstrapped Python into php-buildpack specific
 location

---
 bin/detect         | 2 +-
 bin/install-python | 6 +++---
 bin/release        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/detect b/bin/detect
index e4d9b3793..51f8c4f75 100755
--- a/bin/detect
+++ b/bin/detect
@@ -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
 
diff --git a/bin/install-python b/bin/install-python
index f341eb434..2f9887a1b 100755
--- a/bin/install-python
+++ b/bin/install-python
@@ -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:-}"
diff --git a/bin/release b/bin/release
index 86fd58967..8bc9857a1 100755
--- a/bin/release
+++ b/bin/release
@@ -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