wip

Author: radical

eng/scripts/get-aspire-cli.sh

@@ -19,12 +19,13 @@ readonly RESET='\033[0m'
 INSTALL_PATH=""
 VERSION=""
 QUALITY=""
-OS=""
-ARCH=""
+OS_ARG=""
+ARCH_ARG=""
 SHOW_HELP=false
 VERBOSE=false
 KEEP_ARCHIVE=false
 DRY_RUN=false
+HOST_OS="unset"
 DEFAULT_QUALITY="release"
 
 # Function to show help
@@ -111,7 +112,7 @@ parse_args() {
                     say_info "Use --help for usage information."
                     exit 1
                 fi
-                OS="$2"
+                OS_ARG="$2"
                 shift 2
                 ;;
             --arch)
@@ -120,7 +121,7 @@ parse_args() {
                     say_info "Use --help for usage information."
                     exit 1
                 fi
-                ARCH="$2"
+                ARCH_ARG="$2"
                 shift 2
                 ;;
             -k|--keep-archive)
@@ -662,14 +663,17 @@ construct_aspire_cli_url() {
 # Function to download and install archive
 download_and_install_archive() {
     local temp_dir="$1"
-    local os arch runtimeIdentifier url filename checksum_url checksum_filename extension
+    local target_os="$2"
+    local target_arch="$3"
+
+    local runtimeIdentifier url filename checksum_url checksum_filename extension
     local cli_exe cli_path
 
     # Construct the runtime identifier using the function
-    runtimeIdentifier=$(get_runtime_identifier "$os" "$arch")
+    runtimeIdentifier=$(get_runtime_identifier "$target_os" "$target_arch")
 
     # Determine file extension based on OS
-    if [[ "$os" == "win" ]]; then
+    if [[ "$target_os" == "win" ]]; then
         extension="zip"
     else
         extension="tar.gz"
@@ -705,11 +709,11 @@ download_and_install_archive() {
     fi
 
     # Install the archive
-    if ! install_archive "$filename" "$INSTALL_PATH" "$os"; then
+    if ! install_archive "$filename" "$INSTALL_PATH" "$target_os"; then
         return 1
     fi
 
-    if [[ "$os" == "win" ]]; then
+    if [[ "$target_os" == "win" ]]; then
         cli_exe="aspire.exe"
     else
         cli_exe="aspire"
@@ -727,6 +731,8 @@ if [[ "$SHOW_HELP" == true ]]; then
     exit 0
 fi
 
+HOST_OS=$(detect_os)
+
 # Validate that both --version and --quality are not provided together
 if [[ -n "$VERSION" && -n "$QUALITY" ]]; then
     say_error "Cannot specify both --version and --quality. Use --version for a specific version or --quality for a quality level."
@@ -760,7 +766,7 @@ fi
 trap cleanup EXIT
 
 # Download and install the archive
-if ! download_and_install_archive "$temp_dir"; then
+if ! download_and_install_archive "$temp_dir" "$OS_ARG" "$ARCH_ARG"; then
     exit 1
 fi
 

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

@@ -148,7 +148,7 @@ test_keep_archive_flag() {
 # Test: NuGet hive path construction
 test_nuget_hive_path() {
     local test_install_path="$TEST_BASE_DIR/test-install-nuget-hive"
-    run_test "NuGet hive path is correctly constructed" "$SCRIPT_UNDER_TEST $TEST_PR_NUMBER --install-path $test_install_path --dry-run --verbose" 0 "hive/pr-$TEST_PR_NUMBER" ""
+    run_test "NuGet hive path is correctly constructed" "$SCRIPT_UNDER_TEST $TEST_PR_NUMBER --install-path $test_install_path --dry-run --verbose" 0 "hives/pr-$TEST_PR_NUMBER" ""
 }
 
 # Test: Large PR number validation (should fail for non-existent PR)