mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Changes per manual testing on ubuntu-x64

Browse source
This commit is contained in:
John Beisner 2017-05-22 14:15:43 -07:00
parent 3db157aba6
commit cff302d678
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
scripts/obtain/dotnet-install.sh vendored
View file

@ -115,9 +115,11 @@ get_current_os_name() {
if [ "$uname" = "Darwin" ]; then if [ "$uname" = "Darwin" ]; then
echo "osx" echo "osx"
return 0 return 0
else [ "$uname" = "Linux" ]; then else
echo "linux" if [ "$uname" = "Linux" ]; then
return 0 echo "linux"
return 0
fi
fi fi
say_err "OS name could not be detected: $ID.$VERSION_ID" say_err "OS name could not be detected: $ID.$VERSION_ID"
@ -160,11 +162,11 @@ machine_has() {
check_min_reqs() { check_min_reqs() {
local hasMinimum=false local hasMinimum=false
if machine_has "curl"; then if machine_has "curl"; then
hasMinimum=true; hasMinimum=true
fi elif machine_has "wget"; then
if machine_has "wget"; then hasMinimum=true
hasMinimum=true;
fi fi
if [ "$hasMinimum" = "false" ]; then if [ "$hasMinimum" = "false" ]; then
say_err "curl (recommended) or wget are required to download dotnet. Install missing prerequisite to proceed." say_err "curl (recommended) or wget are required to download dotnet. Install missing prerequisite to proceed."
return 1 return 1
@ -601,10 +603,9 @@ calculate_vars() {
download_link=$(construct_download_link $azure_feed $channel $normalized_architecture $specific_version) download_link=$(construct_download_link $azure_feed $channel $normalized_architecture $specific_version)
say_verbose "download_link=$download_link" say_verbose "download_link=$download_link"
if [ "$uname" = "Linux" ]; then if [ "$(uname)" = "Linux" ]; then
alt_download_link=$(construct_alt_download_link $azure_feed $channel $normalized_architecture $specific_version) alt_download_link=$(construct_alt_download_link $azure_feed $channel $normalized_architecture $specific_version)
say_verbose "alt_download_link=$alt_download_link" say_verbose "alt_download_link=$alt_download_link"
return 0
fi fi
install_root=$(resolve_installation_path $install_dir) install_root=$(resolve_installation_path $install_dir)
@ -627,10 +628,10 @@ install_dotnet() {
download "$download_link" $zip_path download "$download_link" $zip_path
# if the download fails, download the alt_download_link # if the download fails, download the alt_download_link
if [ "$uname" = "Linux" ] && [ -r $zip_path ]; then if [ "$(uname)" = "Linux" ] && [ -r $zip_path ]; then
say "Downloading $alt_download_link" say "Cannot download $download_link"
say "Downloading alternate: $alt_download_link"
download "$alt_download_link" $zip_path download "$alt_download_link" $zip_path
return 0
fi fi
say_verbose "Downloaded file exists and readable? $(if [ -r $zip_path ]; then echo "yes"; else echo "no"; fi)" say_verbose "Downloaded file exists and readable? $(if [ -r $zip_path ]; then echo "yes"; else echo "no"; fi)"
@ -754,9 +755,8 @@ check_min_reqs
calculate_vars calculate_vars
if [ "$dry_run" = true ]; then if [ "$dry_run" = true ]; then
say "Payload URL: $download_link" say "Payload URL: $download_link"
if [ "$uname" = "Linux" ]; then if [ "$(uname)" = "Linux" ]; then
say "Alternate payload URL: $alt_download_link" say "Alternate payload URL: $alt_download_link"
return 0
fi fi
say "Repeatable invocation: ./$(basename $0) --version $specific_version --channel $channel --install-dir $install_dir" say "Repeatable invocation: ./$(basename $0) --version $specific_version --channel $channel --install-dir $install_dir"
exit 0 exit 0