Skip to content

Install bootstrapped Ruby into php-buildpack specific location #855

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
Mar 30, 2023
Merged

Install bootstrapped Ruby into php-buildpack specific location #855

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 @@ -28,7 +28,7 @@ if [ "$CF_STACK" == "cflinuxfs4" ]; then
mkdir -p "${PYTHON_DIR}"
source "$BP/bin/install-python" "$PYTHON_DIR" "$BP" &> /dev/null

RUBY_DIR="/tmp/ruby"
RUBY_DIR="/tmp/php-buildpack/ruby"
mkdir -p "${RUBY_DIR}"
source "$BP/bin/install-ruby" "$RUBY_DIR" "$BP" &> /dev/null
fi
Expand Down
6 changes: 3 additions & 3 deletions bin/install-ruby
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 ruby_dep_name=$(get_ruby_from_manifest "$buildpack_dir")

if [[ ! -d "/tmp/ruby/bin" ]]; then
if [[ ! -d "/tmp/php-buildpack/ruby/bin" ]]; then
setup_ruby "$ruby_dep_name" "$install_dir" "$buildpack_dir"
elif [[ $install_dir != "/tmp/ruby" ]]; then
cp -r "/tmp/ruby/." "$install_dir"
elif [[ $install_dir != "/tmp/php-buildpack/ruby" ]]; then
cp -r "/tmp/php-buildpack/ruby/." "$install_dir"
fi
export PATH="$install_dir/bin:${PATH:-}"
alias ruby=ruby3
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 @@ -30,7 +30,7 @@ if [ "$CF_STACK" == "cflinuxfs4" ]; then
mkdir -p "${PYTHON_DIR}"
source "$BP/bin/install-python" "$PYTHON_DIR" "$BP" &> /dev/null

RUBY_DIR="/tmp/ruby"
RUBY_DIR="/tmp/php-buildpack/ruby"
mkdir -p "${RUBY_DIR}"
source "$BP/bin/install-ruby" "$RUBY_DIR" "$BP" &> /dev/null
fi
Expand Down