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

Alpine fix; plus 1 (#8821)

Browse source 
* The '-n' option to 'cp' does not exist for Alpine; don't use "$ID.$VERSION_ID" for the error message.

* Try "cp -R -u"  for alpine variants.

* Fixing a comment...
This commit is contained in:
John Beisner 2018-03-16 16:26:56 -07:00 • committed by GitHub
parent 0fee1ca867
commit 470acd8abe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -139,19 +139,19 @@ get_linux_platform_name() {
fi
fi
say_verbose "Linux specific platform name and version could not be detected: $ID.$VERSION_ID"
say_verbose "Linux specific platform name and version could not be detected: UName = $uname"
return 1
}
get_current_os_name() {
eval $invocation
linux_platform_name="unknown"
local uname=$(uname)
if [ "$uname" = "Darwin" ]; then
echo "osx"
return 0
elif [ "$uname" = "Linux" ]; then
local linux_platform_name
linux_platform_name="$(get_linux_platform_name)" || { echo "linux" && return 0 ; }
if [[ $linux_platform_name == "rhel.6" || $linux_platform_name == "alpine.3.6" ]]; then
@ -163,7 +163,7 @@ get_current_os_name() {
fi
fi
say_err "OS name could not be detected: $ID.$VERSION_ID"
say_err "OS name could not be detected: UName = $uname"
return 1
}
@ -188,7 +188,7 @@ get_legacy_os_name() {
fi
fi
say_verbose "Distribution specific OS name and version could not be detected: $ID.$VERSION_ID"
say_verbose "Distribution specific OS name and version could not be detected: UName = $uname"
return 1
}
@ -570,7 +570,14 @@ copy_files_or_dirs_from_list() {
local root_path="$(remove_trailing_slash "$1")"
local out_path="$(remove_trailing_slash "$2")"
local override="$3"
local override_switch=$(if [ "$override" = false ]; then printf -- "-n"; fi)
local override_switch=$(
if [ "$override" = false ]; then
if [[ $linux_platform_name == 'alpine'* ]]; then
printf -- "-u";
else
printf -- "-n";
fi
fi)
cat | uniq | while read -r file_path; do
local path="$(remove_beginning_slash "${file_path#$root_path}")"