wip

Author: radical

eng/scripts/get-aspire-cli-pr.sh

@@ -171,7 +171,7 @@ parse_args() {
 }
 
 # =============================================================================
-# START: Code shared with get-aspire-cli*.sh
+# START: Shared code
 # =============================================================================
 
 # Function for verbose logging
@@ -476,7 +476,7 @@ cleanup() {
 }
 
 # =============================================================================
-# END: Code shared with get-aspire-cli*.sh
+# END: Shared code
 # =============================================================================
 
 # Function to check if gh command is available

eng/scripts/get-aspire-cli.ps1

@@ -466,7 +466,7 @@ function Get-InstallPath {
         throw "Unable to determine user home directory. Please specify -InstallPath parameter."
     }
 
-    $defaultPath = Join-Path $homeDirectory ".aspire"
+    $defaultPath = Join-Path $homeDirectory (Join-Path ".aspire" "bin")
     return [System.IO.Path]::GetFullPath($defaultPath)
 }
 

eng/scripts/get-aspire-cli.sh

@@ -149,7 +149,7 @@ parse_args() {
 }
 
 # =============================================================================
-# START: Code shared with other scripts
+# START: Shared code
 # =============================================================================
 
 # Function for verbose logging
@@ -245,30 +245,74 @@ detect_architecture() {
 
 # Function to compute the Runtime Identifier (RID)
 get_runtime_identifier() {
-    local os="$1"
-    local arch="$2"
+    # set target_os to $1 and default to HOST_OS
+    local target_os="$1"
+    local target_arch="$2"
 
-    # Detect OS and architecture if not provided
-    if [[ -z "$OS" ]]; then
-        if ! os=$(detect_os); then
-            say_error "Unsupported operating system. Current platform: $(uname -s)"
+    if [[ -z "$target_os" ]]; then
+        target_os=$HOST_OS
+    fi
+
+    if [[ -z "$target_arch" ]]; then
+        if ! target_arch=$(get_cli_architecture_from_architecture "<auto>"); then
             return 1
         fi
     else
-        os="$OS"
+        if ! target_arch=$(get_cli_architecture_from_architecture "$target_arch"); then
+            return 1
+        fi
+    fi
+
+    printf "%s" "${target_os}-${target_arch}"
+}
+
+# Function to install/unpack archive files
+install_archive() {
+    local archive_file="$1"
+    local destination_path="$2"
+
+    if [[ "$DRY_RUN" == true ]]; then
+        say_info "[DRY RUN] Would install archive $archive_file to $destination_path"
+        return 0
+    fi
+
+    say_verbose "Installing archive to: $destination_path"
+
+    # Create install directory if it doesn't exist
+    if [[ ! -d "$destination_path" ]]; then
+        say_verbose "Creating install directory: $destination_path"
+        mkdir -p "$destination_path"
     fi
 
-    if [[ -z "$ARCH" ]]; then
-        if ! arch=$(get_cli_architecture_from_architecture "<auto>"); then
+    # Check archive format and extract accordingly
+    if [[ "$archive_file" == *.zip ]]; then
+        # Use unzip for ZIP files
+        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
-    else
-        if ! arch=$(get_cli_architecture_from_architecture "$ARCH"); then
+
+        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
+        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."
+        return 1
     fi
 
-    printf "%s" "${os}-${arch}"
+    say_verbose "Successfully installed archive"
 }
 
 # Function to add PATH to shell configuration file
@@ -410,7 +454,7 @@ cleanup() {
 }
 
 # =============================================================================
-# END: Code shared with get-aspire-cli*.sh
+# END: Shared code
 # =============================================================================
 
 # Common function for HTTP requests with centralized configuration