diff options
| author | Jan Vorlicek <janvorli@microsoft.com> | 2017-10-05 19:47:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-05 19:47:01 +0300 |
| commit | 60b6385e29d9c986ed0331498bbaec204eda4ac3 (patch) | |
| tree | 154d4594d99b5ae6001a2fabcb8111554d1604a7 /init-tools.sh | |
| parent | 8dd3815b77adde0be84f87cec6833edd847eab44 (diff) | |
Fix init-tools.sh for Alpine Linux (#24423)
The URL used to get the dotnet sdk for Alpine was accidentally left
unchanged when the URL for other targets was modified.
I have fixed that and also unified the creation of the dotnet-sdk-XXX
part of the URL for all platforms.
Diffstat (limited to 'init-tools.sh')
| -rwxr-xr-x | init-tools.sh | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/init-tools.sh b/init-tools.sh index 87eddca23e..07b1e4a791 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -19,11 +19,14 @@ if [ -z "$__DOTNET_PKG" ]; then if [ "$(uname -m | grep "i[3456]86")" = "i686" ]; then echo "Warning: build not supported on 32 bit Unix" fi + + __PKG_ARCH=x64 + OSName=$(uname -s) case $OSName in Darwin) OS=OSX - __DOTNET_PKG=dotnet-sdk-${__DOTNET_TOOLS_VERSION}-osx-x64 + __PKG_RID=osx ulimit -n 2048 # Format x.y.z as single integer with three digits for each part VERSION=`sw_vers -productVersion| sed -e 's/\./ /g' | xargs printf "%03d%03d%03d"` @@ -34,7 +37,7 @@ if [ -z "$__DOTNET_PKG" ]; then ;; Linux) - __DOTNET_PKG=dotnet-sdk-${__DOTNET_TOOLS_VERSION}-linux-x64 + __PKG_RID=linux OS=Linux if [ -e /etc/os-release ]; then @@ -42,23 +45,25 @@ if [ -z "$__DOTNET_PKG" ]; then if [[ $ID == "alpine" ]]; then # remove the last version digit VERSION_ID=${VERSION_ID%.*} - __DOTNET_PKG=dotnet-dev-alpine.$VERSION_ID-x64 + __PKG_RID=alpine.$VERSION_ID fi elif [ -e /etc/redhat-release ]; then redhatRelease=$(</etc/redhat-release) if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then - __DOTNET_PKG=dotnet-sdk-${__DOTNET_TOOLS_VERSION}-rhel.6-x64 + __PKG_RID=rhel.6 fi fi - + ;; *) - echo "Unsupported OS '$OSName' detected. Downloading linux-x64 tools." + echo "Unsupported OS '$OSName' detected. Downloading linux-$__PKG_ARCH tools." OS=Linux - __DOTNET_PKG=dotnet-sdk-${__DOTNET_TOOLS_VERSION}-linux-x64 + __PKG_RID=linux ;; esac + + __DOTNET_PKG=dotnet-sdk-${__DOTNET_TOOLS_VERSION}-$__PKG_RID-$__PKG_ARCH fi display_error_message() |