wip

Author: radical

eng/scripts/get-aspire-cli.sh

@@ -267,6 +267,39 @@ get_runtime_identifier() {
     printf "%s" "${target_os}-${target_arch}"
 }
 
+# Create a temporary directory with a prefix. Honors DRY_RUN
+new_temp_dir() {
+    local prefix="$1"
+    if [[ "$DRY_RUN" == true ]]; then
+        printf "/tmp/%s-whatif" "$prefix"
+        return 0
+    fi
+    local dir
+    if ! dir=$(mktemp -d -t "${prefix}-XXXXXXXX"); then
+        say_error "Unable to create temporary directory"
+        return 1
+    fi
+    say_verbose "Creating temporary directory: $dir"
+    printf "%s" "$dir"
+}
+
+# Remove a temporary directory unless KEEP_ARCHIVE is set. Honors DRY_RUN
+remove_temp_dir() {
+    local dir="$1"
+    if [[ -z "$dir" || ! -d "$dir" ]]; then
+        return 0
+    fi
+    if [[ "$DRY_RUN" == true ]]; then
+        return 0
+    fi
+    if [[ "$KEEP_ARCHIVE" != true ]]; then
+        say_verbose "Cleaning up temporary files..."
+        rm -rf "$dir" || say_warn "Failed to clean up temporary directory: $dir"
+    else
+        printf "Archive files kept in: %s\n" "$dir"
+    fi
+}
+
 # Function to install/unpack archive files
 install_archive() {
     local archive_file="$1"
@@ -286,30 +319,26 @@ install_archive() {
     fi
 
     # Check archive format and extract accordingly
-    if [[ "$archive_file" == *.zip ]]; then
-        # Use unzip for ZIP files
+    if [[ "$archive_file" =~ \.zip$ ]]; then
         if ! command -v unzip >/dev/null 2>&1; then
             say_error "unzip command not found. Please install unzip to extract ZIP files."
             return 1
         fi
-
         if ! unzip -o "$archive_file" -d "$destination_path"; then
             say_error "Failed to extract ZIP archive: $archive_file"
             return 1
         fi
-    elif [[ "$archive_file" == *.tar.gz ]]; then
-        # Use tar for tar.gz files on Unix systems
+    elif [[ "$archive_file" =~ \.tar\.gz$ ]]; then
         if ! command -v tar >/dev/null 2>&1; then
             say_error "tar command not found. Please install tar to extract tar.gz files."
             return 1
         fi
-
         if ! tar -xzf "$archive_file" -C "$destination_path"; then
             say_error "Failed to extract tar.gz archive: $archive_file"
             return 1
         fi
     else
-        say_error "Unsupported archive format: $archive_file. Only .zip and .tar.gz are supported."
+        say_error "Unsupported archive format: $archive_file. Only .zip and .tar.gz files are supported."
         return 1
     fi
 
@@ -436,24 +465,6 @@ add_to_shell_profile() {
     return 0
 }
 
-# Cleanup function for temporary directory
-cleanup() {
-    # shellcheck disable=SC2317  # Function is called via trap
-    if [[ "$DRY_RUN" == true ]]; then
-        # No cleanup needed in dry-run mode
-        return 0
-    fi
-
-    if [[ -n "${temp_dir:-}" ]] && [[ -d "$temp_dir" ]]; then
-        if [[ "$KEEP_ARCHIVE" != true ]]; then
-            say_verbose "Cleaning up temporary files..."
-            rm -rf "$temp_dir" || say_warn "Failed to clean up temporary directory: $temp_dir"
-        else
-            printf "Archive files kept in: %s\n" "$temp_dir"
-        fi
-    fi
-}
-
 # =============================================================================
 # END: Shared code
 # =============================================================================
@@ -709,7 +720,7 @@ download_and_install_archive() {
     fi
 
     # Install the archive
-    if ! install_archive "$filename" "$INSTALL_PATH" "$target_os"; then
+    if ! install_archive "$filename" "$INSTALL_PATH"; then
         return 1
     fi
 
@@ -754,16 +765,9 @@ else
     INSTALL_PATH_UNEXPANDED="$INSTALL_PATH"
 fi
 
-# Create a temporary directory for downloads
-if [[ "$DRY_RUN" == true ]]; then
-    temp_dir="/tmp/aspire-cli-dry-run"
-else
-    temp_dir=$(mktemp -d -t aspire-cli-download-XXXXXXXX)
-    say_verbose "Creating temporary directory: $temp_dir"
-fi
-
-# Set trap for cleanup on exit
-trap cleanup EXIT
+# Create a temporary directory for downloads and set cleanup trap
+temp_dir=$(new_temp_dir "aspire-cli-download")
+trap 'remove_temp_dir "$temp_dir"' EXIT
 
 # Download and install the archive
 if ! download_and_install_archive "$temp_dir" "$OS_ARG" "$ARCH_ARG"; then