diff options
| author | Wes Haggard <Wes.Haggard@microsoft.com> | 2017-10-25 09:02:45 -0700 |
|---|---|---|
| committer | Wes Haggard <Wes.Haggard@microsoft.com> | 2017-10-30 13:06:26 -0700 |
| commit | 3c483846130b17c6c3a7d712c139d2195798165e (patch) | |
| tree | d76910afa114a4c7b388287273c47a802df24560 /init-tools.sh | |
| parent | 4a259ae17d2550d32b95800fcbb68267cd809659 (diff) | |
| download | coreclr-3c483846130b17c6c3a7d712c139d2195798165e.tar.gz coreclr-3c483846130b17c6c3a7d712c139d2195798165e.tar.bz2 coreclr-3c483846130b17c6c3a7d712c139d2195798165e.zip | |
Move CoreCLRPackageVersion property useage
Also did some small clean-up:
Fix missing tag from bad merge
Fix spacing in init-tools.sh
Diffstat (limited to 'init-tools.sh')
| -rwxr-xr-x | init-tools.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/init-tools.sh b/init-tools.sh index 7da424f286..c1c3ef6cd4 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -49,13 +49,13 @@ if [ ! -e $__DOTNET_PATH ]; then echo "Warning: build not supported on 32 bit Unix" fi - __PKG_ARCH=x64 + __PKG_ARCH=x64 OSName=$(uname -s) case $OSName in Darwin) OS=OSX - __PKG_RID=osx + __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"` @@ -66,7 +66,7 @@ if [ ! -e $__DOTNET_PATH ]; then ;; Linux) - __PKG_RID=linux + __PKG_RID=linux OS=Linux if [ -e /etc/os-release ]; then @@ -88,15 +88,15 @@ if [ ! -e $__DOTNET_PATH ]; then *) echo "Unsupported OS '$OSName' detected. Downloading linux-$__PKG_ARCH tools." OS=Linux - __PKG_RID=linux + __PKG_RID=linux ;; esac - __DOTNET_PKG=dotnet-sdk-${__DOTNET_TOOLS_VERSION}-$__PKG_RID-$__PKG_ARCH + __DOTNET_PKG=dotnet-sdk-${__DOTNET_TOOLS_VERSION}-$__PKG_RID-$__PKG_ARCH fi mkdir -p "$__DOTNET_PATH" echo "Installing dotnet cli..." - __DOTNET_LOCATION="https://dotnetcli.azureedge.net/dotnet/Sdk/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.tar.gz" + __DOTNET_LOCATION="https://dotnetcli.azureedge.net/dotnet/Sdk/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.tar.gz" # curl has HTTPS CA trust-issues less often than wget, so lets try that first. echo "Installing '${__DOTNET_LOCATION}' to '$__DOTNET_PATH/dotnet.tar'" >> $__init_tools_log if command -v curl > /dev/null; then |