From 661e281b6d277c73dcab4c70c0dc066a8d5b6f71 Mon Sep 17 00:00:00 2001 From: Scion Date: Mon, 7 Jul 2025 22:05:23 -0700 Subject: [PATCH] Updated nuget. --- dotnet/dotnet-10/nuget_utils.sh | 19 ++++++++++++++----- dotnet/dotnet/nuget_utils.sh | 19 ++++++++++++++----- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dotnet/dotnet-10/nuget_utils.sh b/dotnet/dotnet-10/nuget_utils.sh index 24e4a6c..3c48618 100644 --- a/dotnet/dotnet-10/nuget_utils.sh +++ b/dotnet/dotnet-10/nuget_utils.sh @@ -5,17 +5,26 @@ add_or_remove_nuget_source() { local source="$2" local username="$3" local password="$4" + local source_number="$5" if [[ -n "$source" ]]; then if [[ "$action" == "remove" ]]; then echo "Removing NuGet source: $source" dotnet nuget remove source "$source" 2>/dev/null || true else - echo "Adding NuGet source: $source" - if [[ -n "$username" && -n "$password" ]]; then - dotnet nuget add source "$source" --username "$username" --password "$password" --store-password-in-clear-text + # Extract name from URL or use fallback + local name + if [[ "$source" =~ /api/packages/([^/]+)/nuget/ ]]; then + name="${BASH_REMATCH[1]}" else - dotnet nuget add source "$source" + name="Source $source_number" + fi + + echo "Adding NuGet source: $source (name: $name)" + if [[ -n "$username" && -n "$password" ]]; then + dotnet nuget add source "$source" --name "$name" --username "$username" --password "$password" --store-password-in-clear-text + else + dotnet nuget add source "$source" --name "$name" fi fi fi @@ -38,7 +47,7 @@ handle_nuget_sources() { username=$(echo "${usernames[$i]:-}" | xargs) password=$(echo "${passwords[$i]:-}" | xargs) - add_or_remove_nuget_source "$action" "$source" "$username" "$password" + add_or_remove_nuget_source "$action" "$source" "$username" "$password" "$((i + 1))" done fi } diff --git a/dotnet/dotnet/nuget_utils.sh b/dotnet/dotnet/nuget_utils.sh index 24e4a6c..3c48618 100644 --- a/dotnet/dotnet/nuget_utils.sh +++ b/dotnet/dotnet/nuget_utils.sh @@ -5,17 +5,26 @@ add_or_remove_nuget_source() { local source="$2" local username="$3" local password="$4" + local source_number="$5" if [[ -n "$source" ]]; then if [[ "$action" == "remove" ]]; then echo "Removing NuGet source: $source" dotnet nuget remove source "$source" 2>/dev/null || true else - echo "Adding NuGet source: $source" - if [[ -n "$username" && -n "$password" ]]; then - dotnet nuget add source "$source" --username "$username" --password "$password" --store-password-in-clear-text + # Extract name from URL or use fallback + local name + if [[ "$source" =~ /api/packages/([^/]+)/nuget/ ]]; then + name="${BASH_REMATCH[1]}" else - dotnet nuget add source "$source" + name="Source $source_number" + fi + + echo "Adding NuGet source: $source (name: $name)" + if [[ -n "$username" && -n "$password" ]]; then + dotnet nuget add source "$source" --name "$name" --username "$username" --password "$password" --store-password-in-clear-text + else + dotnet nuget add source "$source" --name "$name" fi fi fi @@ -38,7 +47,7 @@ handle_nuget_sources() { username=$(echo "${usernames[$i]:-}" | xargs) password=$(echo "${passwords[$i]:-}" | xargs) - add_or_remove_nuget_source "$action" "$source" "$username" "$password" + add_or_remove_nuget_source "$action" "$source" "$username" "$password" "$((i + 1))" done fi }