use the downloaded ruby tarball

DataDog · Jul 4, 2023 · 371a164 · 371a164
1 parent b3f3d49
commit 371a164
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/bin/compile b/bin/compile
@@ -12,22 +12,22 @@ DATADOG_DIR="${BUILD_DIR}/.datadog"
 
 RUBY_DIR="$DATADOG_DIR/tmp/ruby"
 RUBY_BIN="$RUBY_DIR/bin/ruby"
-RUBY_TAR="$BIN_DIR/ruby_3.0.5_linux_x64_cflinuxfs3_098393c3.tgz"
 
 mkdir -p "${DATADOG_DIR}/scripts"
 cp "${ROOT_DIR}/lib/scripts/update_agent_config.sh" "${DATADOG_DIR}/scripts/update_agent_config.sh"
 chmod +x "${DATADOG_DIR}/scripts/update_agent_config.sh"
 cp "${ROOT_DIR}/lib/scripts/get_tags.rb" "${DATADOG_DIR}/scripts/get_tags.rb"
 
+if [ -f "${ROOT_DIR}/lib/ruby_3.0.5.tgz" ]; then
+  cp "${ROOT_DIR}/lib/ruby_3.0.5.tgz" "${DATADOG_DIR}/ruby_3.0.5.tgz"
+fi
+
 if ! which ruby > /dev/null; then
   echo "Preparing to install Ruby"
   mkdir -p "${RUBY_DIR}"
 
   echo "Installing Ruby"
-  cp "${RUBY_TAR}" /home/vcap/app/.datadog/ruby.tgz
-  tar -xzf "${RUBY_TAR}" -C "${RUBY_DIR}"
-
-  export PATH="$RUBY_DIR/bin:${PATH:-}"
+  tar -xzf "${DATADOG_DIR}/ruby_3.0.5.tgz" -C "${RUBY_DIR}"
 else
   RUBY_BIN=$(which ruby)
 fi

diff --git a/bin/ruby_3.0.5_linux_x64_cflinuxfs3_098393c3.tgz b/bin/ruby_3.0.5_linux_x64_cflinuxfs3_098393c3.tgz
diff --git a/bin/supply b/bin/supply
@@ -12,22 +12,22 @@ DATADOG_DIR="${BUILD_DIR}/.datadog"
 
 RUBY_DIR="$DATADOG_DIR/tmp/ruby"
 RUBY_BIN="$RUBY_DIR/bin/ruby"
-RUBY_TAR="$BIN_DIR/ruby_3.0.5_linux_x64_cflinuxfs3_098393c3.tgz"
 
 mkdir -p "${DATADOG_DIR}/scripts"
 cp "${ROOT_DIR}/lib/scripts/update_agent_config.sh" "${DATADOG_DIR}/scripts/update_agent_config.sh"
 chmod +x "${DATADOG_DIR}/scripts/update_agent_config.sh"
 cp "${ROOT_DIR}/lib/scripts/get_tags.rb" "${DATADOG_DIR}/scripts/get_tags.rb"
 
+if [ -f "${ROOT_DIR}/lib/ruby_3.0.5.tgz" ]; then
+  cp "${ROOT_DIR}/lib/ruby_3.0.5.tgz" "${DATADOG_DIR}/ruby_3.0.5.tgz"
+fi
+
 if ! which ruby > /dev/null; then
   echo "Preparing to install Ruby"
   mkdir -p "${RUBY_DIR}"
 
   echo "Installing Ruby"
-  cp "${RUBY_TAR}" /home/vcap/app/.datadog/ruby.tgz
-  tar -xzf "${RUBY_TAR}" -C "${RUBY_DIR}"
-
-  export PATH="$RUBY_DIR/bin:${PATH:-}"
+  tar -xzf "${DATADOG_DIR}/ruby_3.0.5.tgz" -C "${RUBY_DIR}"
 else
   RUBY_BIN=$(which ruby)
 fi