diff options
Diffstat (limited to 'init-tools.sh')
| -rwxr-xr-x | init-tools.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/init-tools.sh b/init-tools.sh index 969c98548..bb7362a08 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -42,9 +42,7 @@ if [ -z "$__DOTNET_PKG" ]; then if [ -e /etc/os-release ]; then source /etc/os-release if [[ $ID == "alpine" ]]; then - # remove the last version digit - VERSION_ID=${VERSION_ID%.*} - __PKG_RID=alpine.$VERSION_ID + __PKG_RID="linux-musl" fi elif [ -e /etc/redhat-release ]; then @@ -62,7 +60,8 @@ if [ -z "$__DOTNET_PKG" ]; then __PKG_RID=linux ;; esac - __DOTNET_PKG=dotnet-sdk-${__DOTNET_TOOLS_VERSION}-$__PKG_RID-$__HostArch + __PKG_RID=$__PKG_RID-$__HostArch + __DOTNET_PKG=dotnet-sdk-${__DOTNET_TOOLS_VERSION}-$__PKG_RID fi display_error_message() @@ -147,10 +146,7 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then ls $__scriptpath/Tools/*.sh | xargs chmod +x ls $__scriptpath/Tools/scripts/docker/*.sh | xargs chmod +x - Tools/crossgen.sh $__scriptpath/Tools - - # CoreRT does not use special copy of the shared runtime for testing - cp $__TOOLRUNTIME_DIR/csc.runtimeconfig.json $__TOOLRUNTIME_DIR/xunit.console.netcore.runtimeconfig.json + Tools/crossgen.sh $__scriptpath/Tools $__PKG_RID mkdir -p $__INIT_TOOLS_DONE_MARKER_DIR touch $__INIT_TOOLS_DONE_MARKER |