Updating CLI to 2.0 RTM (dotnet/core-setup#3293)

Update init-tools scripts for 2.0 CLI

Commit migrated from https://github.com/dotnet/core-setup/commit/4f2c1bc6ddbcbb27053a009081ef7d060b9cdb67

diff --git a/src/installer/DotnetCLIVersion.txt b/src/installer/DotnetCLIVersion.txt
index 170f3fc..227cea2 100644 (file)
--- a/src/installer/DotnetCLIVersion.txt
+++ b/src/installer/DotnetCLIVersion.txt
@@ -1 +1 @@
-2.0.0-preview1-005977
+2.0.0

diff --git a/src/installer/init-tools.cmd b/src/installer/init-tools.cmd
index 7f31e16..0c3ca90 100644 (file)
--- a/src/installer/init-tools.cmd
+++ b/src/installer/init-tools.cmd
@@ -47,7 +47,7 @@ if exist "%DOTNET_CMD%" goto :afterdotnetrestore
 
 echo Installing dotnet cli...
 if NOT exist "%DOTNET_PATH%" mkdir "%DOTNET_PATH%"
-set DOTNET_ZIP_NAME=dotnet-dev-win-x64.%DOTNET_VERSION%.zip
+set DOTNET_ZIP_NAME=dotnet-sdk-%DOTNET_VERSION%-win-x64.zip
 set DOTNET_REMOTE_PATH=https://dotnetcli.azureedge.net/dotnet/Sdk/%DOTNET_VERSION%/%DOTNET_ZIP_NAME%
 set DOTNET_LOCAL_PATH=%DOTNET_PATH%%DOTNET_ZIP_NAME%
 echo Installing '%DOTNET_REMOTE_PATH%' to '%DOTNET_LOCAL_PATH%' >> "%INIT_TOOLS_LOG%"

diff --git a/src/installer/init-tools.sh b/src/installer/init-tools.sh
index 1a0f7ae..c1c3ef6 100755 (executable)
--- a/src/installer/init-tools.sh
+++ b/src/installer/init-tools.sh
@@ -37,58 +37,72 @@ fi
 
 echo "Running: $__scriptpath/init-tools.sh" > $__init_tools_log
 
+display_error_message()
+{
+    echo "Please check the detailed log that follows." 1>&2
+    cat "$__init_tools_log" 1>&2
+}
+
 if [ ! -e $__DOTNET_PATH ]; then
     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-dev-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"`
+                if [ "$VERSION" -lt 010012000 ]; then
+                    echo error: macOS version `sw_vers -productVersion` is too old. 10.12 is needed as minimum.
+                    exit 1
+                fi
                 ;;
 
-                       Linux)
-                               __DOTNET_PKG=dotnet-dev-linux-x64
-                               OS=Linux
-
-                               if [ -e /etc/os-release ]; then
-                                       source /etc/os-release
-                                       if [[ $ID == "alpine" ]]; then
-                                               # remove the last version digit
-                                               VERSION_ID=${VERSION_ID%.*}
-                                               __DOTNET_PKG=dotnet-dev-alpine.$VERSION_ID-x64
-                                       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-dev-rhel.6-x64
-                                       fi
-                               fi                      
-                       
-                               ;;
+            Linux)
+                __PKG_RID=linux
+                OS=Linux
+
+                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
+                    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
+                    __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-dev-linux-x64
+                __PKG_RID=linux
                 ;;
       esac
+    __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}.${__DOTNET_TOOLS_VERSION}.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
-    which curl > /dev/null 2> /dev/null
-    if [ $? -ne 0 ]; then
-        wget -q -O $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION}
-    else
+    if command -v curl > /dev/null; then
         curl --retry 10 -sSL --create-dirs -o $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION}
+    else
+        wget -q -O $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION}
     fi
     cd $__DOTNET_PATH
     tar -xf $__DOTNET_PATH/dotnet.tar
@@ -100,7 +114,10 @@ if [ ! -e $__BUILD_TOOLS_PATH ]; then
     echo "Restoring BuildTools version $__BUILD_TOOLS_PACKAGE_VERSION..."
     echo "Running: $__DOTNET_CMD restore \"$__INIT_TOOLS_RESTORE_PROJECT\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION" >> $__init_tools_log
     $__DOTNET_CMD restore "$__INIT_TOOLS_RESTORE_PROJECT" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION >> $__init_tools_log
-    if [ ! -e "$__BUILD_TOOLS_PATH/init-tools.sh" ]; then echo "ERROR: Could not restore build tools correctly. See '$__init_tools_log' for more details."1>&2; fi
+    if [ ! -e "$__BUILD_TOOLS_PATH/init-tools.sh" ]; then
+        echo "ERROR: Could not restore build tools correctly." 1>&2
+        display_error_message
+    fi
 fi
 
 echo "Initializing BuildTools..."
@@ -110,7 +127,8 @@ echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__
 chmod +x $__BUILD_TOOLS_PATH/init-tools.sh
 $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR >> $__init_tools_log
 if [ "$?" != "0" ]; then
-    echo "ERROR: An error occured when trying to initialize the tools. Please check '$__init_tools_log' for more details."1>&2
+    echo "ERROR: An error occurred when trying to initialize the tools." 1>&2
+    display_error_message
     exit 1
 fi