Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Alpine fix; plus 1 #8821

Merged
johnbeisner merged 3 commits into from
Mar 16, 2018
Merged

Alpine fix; plus 1 #8821

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7228a96
The '-n' option to 'cp' does not exist for Alpine; don't use "$ID.$VE…
Mar 16, 2018
ef2621a
Try "cp -R -u" for alpine variants.
Mar 16, 2018
f97d234
Fixing a comment...
Mar 16, 2018
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
17 changes: 12 additions & 5 deletions scripts/obtain/dotnet-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}

Expand All @@ -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
}

Expand Down Expand Up @@ -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}")"
Expand Down