Move download logic to separate script and simplify install args

Author: Rusydy-Mekari

bin/download

@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+
+get_download_url() {
+  local install_type=$1
+  local version=$2
+
+  echo "https://github.com/php/php-src/archive/php-${version}.tar.gz"
+}
+
+get_php_version() {
+  IFS='-' read -r -a version_info <<<"$1"
+
+  if [ "${#version_info[@]}" -eq 1 ]; then
+    echo "${version_info[0]}"
+  else
+    echo "${version_info[0]}-${version_info[1]}"
+  fi
+}
+
+download_source() {
+  local install_type=$1
+  local version=$2
+  local download_path=$3
+
+  local php_version
+  php_version=$(get_php_version "$version")
+  local download_file="$download_path/php-${php_version}.tar.gz"
+  local download_url
+  download_url=$(get_download_url "$install_type" "$version")
+
+  echo "Downloading PHP source from $download_url"
+  curl -Lo "$download_file" "$download_url"
+
+  echo "Extracting PHP source..."
+  tar -xzf "$download_file" -C "$download_path" --strip-components=0
+
+  # The extracted directory name
+  local extracted_dir="$download_path/php-src-php-${php_version}"
+
+  # Move contents to download_path root if extracted to subdirectory
+  if [ -d "$extracted_dir" ]; then
+    mv "$extracted_dir"/* "$download_path"/
+    rm -rf "$extracted_dir"
+  fi
+
+  # Clean up tarball
+  rm -f "$download_file"
+}
+
+download_source "$ASDF_INSTALL_TYPE" "$ASDF_INSTALL_VERSION" "$ASDF_DOWNLOAD_PATH"

bin/install

@@ -3,15 +3,8 @@
 set -eo pipefail
 
 install_php() {
-  local install_type=$1
-  local version=$2
-  local install_path=$3
-
-  if [ "$TMPDIR" = "" ]; then
-    local tmp_download_dir=$(mktemp -d)
-  else
-    local tmp_download_dir=${TMPDIR%/}
-  fi
+  local install_path=$1
+  local download_path=$2
 
   echo "Determining configuration options..."
   local source_path=$(get_download_file_path $install_type $version $tmp_download_dir)
@@ -360,54 +353,5 @@ os_based_configure_options() {
   echo $configure_options
 }
 
-download_source() {
-  local install_type=$1
-  local version=$2
-  local download_path=$3
-  local download_url=$(get_download_url $install_type $version)
-
-  # curl -Lo $download_path -C - $download_url
-  curl -Lo $download_path $download_url
-}
-
-get_download_file_path() {
-  local install_type=$1
-  local version=$2
-  local tmp_download_dir=$3
-  local php_version=$(get_php_version $version)
-  local pkg_name="php-${php_version}.tar.gz"
-
-  echo "$tmp_download_dir/$pkg_name"
-}
-
-untar_path() {
-  local install_type=$1
-  local version=$2
-  local tmp_download_dir=$3
-
-  local php_version=$(get_php_version $version)
-
-  local dir_name="php-src-php-${php_version}"
-
-  echo "$tmp_download_dir/$dir_name"
-}
-
-get_download_url() {
-  local install_type=$1
-  local version=$2
-
-  echo "https://github.com/php/php-src/archive/php-${version}.tar.gz"
-}
-
-get_php_version() {
-  IFS='-' read -a version_info <<<"$1"
-
-  if [ "${#version_info[@]}" -eq 1 ]; then
-    echo "${version_info[0]}"
-  else
-    echo "${version_info[0]}-${version_info[1]}"
-  fi
-}
-
-install_php "$ASDF_INSTALL_TYPE" "$ASDF_INSTALL_VERSION" "$ASDF_INSTALL_PATH"
+install_php "$ASDF_INSTALL_PATH" "$ASDF_DOWNLOAD_PATH"
 install_composer "$ASDF_INSTALL_PATH"