Skip to content

Bash script returns failure if the sdk is already installed #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bekir-ozturk merged 4 commits into from
Jan 14, 2022
Merged

Bash script returns failure if the sdk is already installed #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5175f5
Fix return code
bekir-ozturk Jan 12, 2022
d4799e0
Fix dryrun
bekir-ozturk Jan 13, 2022
866fb94
Changed dryrun checking
bekir-ozturk Jan 13, 2022
4253ccf
Updating comments
bekir-ozturk Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 25 additions & 27 deletions src/dotnet-install.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,12 +869,12 @@ function Prepend-Sdk-InstallRoot-To-Path([string]$InstallRoot) {
}
}

function PrintDryRunOutput($Invocation, [string] $DownloadLink, [string] $LegacyDownloadLink, [string] $SpecificVersion, [string] $EffectiveVersion)
function PrintDryRunOutput($Invocation, $DownloadLinks)
{
Say "Payload URLs:"
Say "Primary named payload URL: ${DownloadLink}"
if ($LegacyDownloadLink) {
Say "Legacy named payload URL: ${LegacyDownloadLink}"

for ($linkIndex=0; $linkIndex -lt $DownloadLinks.count; $linkIndex++) {
Say "URL #$linkIndex - $($DownloadLinks[$linkIndex].type): $($DownloadLinks[$linkIndex].downloadLink)"
}
$RepeatableCommand = ".\$ScriptName -Version `"$SpecificVersion`" -InstallDir `"$InstallRoot`" -Architecture `"$CLIArchitecture`""
if ($Runtime -eq "dotnet") {
Expand Down Expand Up @@ -1111,17 +1111,14 @@ if ([string]::IsNullOrEmpty($JSonFile) -and ($Version -eq "latest")) {
$DownloadLinks += New-Object PSObject -Property @{downloadLink="$DownloadLink";specificVersion="$SpecificVersion";effectiveVersion="$EffectiveVersion";type='aka.ms'}
Say-Verbose "Generated aka.ms link $DownloadLink with version $EffectiveVersion"

if ($DryRun) {
PrintDryRunOutput $MyInvocation $DownloadLink $null $SpecificVersion $EffectiveVersion
return
}

Say-Verbose "Checking if the version $EffectiveVersion is already installed"
if (Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $EffectiveVersion)
{
Say "$assetName version $EffectiveVersion is already installed."
Prepend-Sdk-InstallRoot-To-Path -InstallRoot $InstallRoot
return
if (-Not $DryRun) {
Say-Verbose "Checking if the version $EffectiveVersion is already installed"
if (Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $EffectiveVersion)
{
Say "$assetName with version '$EffectiveVersion' is already installed."
Prepend-Sdk-InstallRoot-To-Path -InstallRoot $InstallRoot
return
}
}
}
}
Expand All @@ -1141,20 +1138,17 @@ if ([string]::IsNullOrEmpty($NormalizedQuality) -and 0 -eq $DownloadLinks.count)

if (-not [string]::IsNullOrEmpty($LegacyDownloadLink)) {
$DownloadLinks += New-Object PSObject -Property @{downloadLink="$LegacyDownloadLink";specificVersion="$SpecificVersion";effectiveVersion="$EffectiveVersion";type='legacy'}
Say-Verbose "Generated legacy link $DownloadLink with version $EffectiveVersion"
Say-Verbose "Generated legacy link $LegacyDownloadLink with version $EffectiveVersion"
}

if ($DryRun) {
PrintDryRunOutput $MyInvocation $DownloadLink $LegacyDownloadLink $SpecificVersion $EffectiveVersion
return
}

Say-Verbose "Checking if the version $EffectiveVersion is already installed"
if (Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $EffectiveVersion)
{
Say "$assetName version $EffeciveVersion is already installed."
Prepend-Sdk-InstallRoot-To-Path -InstallRoot $InstallRoot
return
if (-Not $DryRun) {
Say-Verbose "Checking if the version $EffectiveVersion is already installed"
if (Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage $dotnetPackageRelativePath -SpecificVersion $EffectiveVersion)
{
Say "$assetName with version '$EffectiveVersion' is already installed."
Prepend-Sdk-InstallRoot-To-Path -InstallRoot $InstallRoot
return
}
}
}
catch
Expand All @@ -1168,6 +1162,10 @@ if ($DownloadLinks.count -eq 0) {
throw "Failed to resolve the exact version number."
}

if ($DryRun) {
PrintDryRunOutput $MyInvocation $DownloadLinks
return
}

Prepare-Install-Directory

Expand Down
58 changes: 21 additions & 37 deletions src/dotnet-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,6 +1144,7 @@ get_feeds_to_use()
fi
}

# THIS FUNCTION MAY EXIT (if the determined version is already installed).
generate_download_links() {

download_links=()
Expand All @@ -1152,12 +1153,14 @@ generate_download_links() {
link_types=()

# If generate_akams_links returns false, no fallback to old links. Just terminate.
# This function may also 'exit' (if the determined version is already installed).
generate_akams_links || return

# Check other feeds only if we haven't been able to find an aka.ms link.
if [[ "${#download_links[@]}" -lt 1 ]]; then
for feed in ${feeds[@]}
do
# generate_regular_links may also 'exit' (if the determined version is already installed).
generate_regular_links $feed || return
done
fi
Expand All @@ -1174,9 +1177,7 @@ generate_download_links() {
done
}

# returns:
# 0 - if operation succeeded and the execution should continue as normal
# 1 - if the script has reached a concluding state and the execution should stop.
# THIS FUNCTION MAY EXIT (if the determined version is already installed).
generate_akams_links() {
local valid_aka_ms_link=true;

Expand Down Expand Up @@ -1211,15 +1212,10 @@ generate_akams_links() {
effective_versions+=($effective_version)
link_types+=("aka.ms")

if [[ "$dry_run" == true ]]; then
print_dry_run "$download_link" "" "$effective_version"
return 1
fi

# Check if the SDK version is already installed.
if is_dotnet_package_installed "$install_root" "$asset_relative_path" "$effective_version"; then
if [[ "$dry_run" != true ]] && is_dotnet_package_installed "$install_root" "$asset_relative_path" "$effective_version"; then
say "$asset_name with version '$effective_version' is already installed."
return 1
exit 0
fi

return 0
Expand All @@ -1234,11 +1230,9 @@ generate_akams_links() {
say_verbose "Falling back to latest.version file approach."
}

# THIS FUNCTION MAY EXIT (if the determined version is already installed)
# args:
# feed - $1
# returns:
# 0 - if operation succeded and the execution should continue as normal
# 1 - if the script has reached a concluding state and the execution should stop
generate_regular_links() {
local feed="$1"
local valid_legacy_download_link=true
Expand Down Expand Up @@ -1276,33 +1270,24 @@ generate_regular_links() {
say_verbose "Cound not construct a legacy_download_link; omitting..."
fi

if [[ "$dry_run" == true ]]; then
print_dry_run "$download_link" "$legacy_download_link" "$effective_version"
return 1
fi

# Check if the SDK version is already installed.
if is_dotnet_package_installed "$install_root" "$asset_relative_path" "$effective_version"; then
if [[ "$dry_run" != true ]] && is_dotnet_package_installed "$install_root" "$asset_relative_path" "$effective_version"; then
say "$asset_name with version '$effective_version' is already installed."
return 1
exit 0
fi
}

# args:
# download_link - $1
# legacy_download_link - $2 - can be empty
# specific_version
print_dry_run() {
local download_link="$1"
local legacy_download_link="$2"
local specific_version="$3"

say "Payload URLs:"
say "Primary named payload URL: ${download_link}"
if [ -n "$legacy_download_link" ]; then
say "Legacy named payload URL: ${legacy_download_link}"
fi
repeatable_command="./$script_name --version "\""$specific_version"\"" --install-dir "\""$install_root"\"" --architecture "\""$normalized_architecture"\"" --os "\""$normalized_os"\"""

for link_index in "${!download_links[@]}"
do
say "URL #$link_index - ${link_types[$link_index]}: ${download_links[$link_index]}"
done

resolved_version=${specific_versions[0]}
repeatable_command="./$script_name --version "\""$resolved_version"\"" --install-dir "\""$install_root"\"" --architecture "\""$normalized_architecture"\"" --os "\""$normalized_os"\"""

if [ ! -z "$normalized_quality" ]; then
repeatable_command+=" --quality "\""$normalized_quality"\"""
Expand All @@ -1321,7 +1306,6 @@ print_dry_run() {
fi

say "Repeatable invocation: $repeatable_command"
exit 0
}

calculate_vars() {
Expand Down Expand Up @@ -1648,12 +1632,12 @@ fi

check_min_reqs
calculate_vars
# generate_regular_links call below will 'exit' if the determined version is already installed.
generate_download_links


if [ "$dry_run" = true ]; then
# Don't continue to installation step in dry_run mode.
return
if [[ "$dry_run" = true ]]; then
print_dry_run
exit 0
fi

install_dotnet
Expand Down
Loading