From 27ff72530acc8c59f3c2211b2d76e0f0333bc8f9 Mon Sep 17 00:00:00 2001
From: Jan Vorlicek <janvorli@microsoft.com>
Date: Thu, 14 Sep 2017 16:37:04 +0200
Subject: [PATCH] Enable end to end Alpine core-setup build

This change enables full end to end build of core-setup including
managed code on Alpine Linux.


Commit migrated from https://github.com/dotnet/core-setup/commit/c8a27076f93c3107759b8a86a02ea4f40d100b67
---
 src/installer/corehost/build.sh                         | 13 +++++++------
 src/installer/corehost/common/pal.unix.cpp              | 17 ++++++++++++++---
 src/installer/init-tools.sh                             | 11 +++++++++--
 .../Native/PlatformApis.cs                              | 12 +++++++++---
 4 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/src/installer/corehost/build.sh b/src/installer/corehost/build.sh
index 5b368d2..d947c4c 100755
--- a/src/installer/corehost/build.sh
+++ b/src/installer/corehost/build.sh
@@ -22,13 +22,14 @@ init_rid_plat()
         __rid_plat=""
         if [ -e /etc/os-release ]; then
             source /etc/os-release
-            if [[ "$ID" == "rhel" && $VERSION_ID = 7* ]]; then
-                __rid_plat="rhel.7"
-            elif [[ "$ID" == "centos" && "$VERSION_ID" = "7" ]]; then
-                __rid_plat="rhel.7"
-            else
-                __rid_plat="$ID.$VERSION_ID"
+            if [[ "$ID" == "centos" ]]; then
+                ID="rhel"
+            fi
+            if [[ "$ID" == "rhel" || "$ID" == "alpine" ]]; then
+                # remove the last version number
+                VERSION_ID=${VERSION_ID%.*}
             fi
+            __rid_plat="$ID.$VERSION_ID"
         elif [ -e /etc/redhat-release ]; then
             local redhatRelease=$(</etc/redhat-release)
             if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then
diff --git a/src/installer/corehost/common/pal.unix.cpp b/src/installer/corehost/common/pal.unix.cpp
index 65c356f..71ecc06 100644
--- a/src/installer/corehost/common/pal.unix.cpp
+++ b/src/installer/corehost/common/pal.unix.cpp
@@ -257,16 +257,27 @@ static
 pal::string_t normalize_linux_rid(pal::string_t rid)
 {
     pal::string_t rhelPrefix(_X("rhel."));
+    pal::string_t alpinePrefix(_X("alpine."));
+    size_t lastVersionSeparatorIndex = std::string::npos;
 
     if (rid.compare(0, rhelPrefix.length(), rhelPrefix) == 0)
     {
-        size_t minorVersionSeparatorIndex = rid.find(_X("."), rhelPrefix.length());
-        if (minorVersionSeparatorIndex != std::string::npos)
+        lastVersionSeparatorIndex = rid.find(_X("."), rhelPrefix.length());
+    }
+    else if (rid.compare(0, alpinePrefix.length(), alpinePrefix) == 0)
+    {
+        size_t secondVersionSeparatorIndex = rid.find(_X("."), alpinePrefix.length());
+        if (secondVersionSeparatorIndex != std::string::npos)
         {
-            rid.erase(minorVersionSeparatorIndex, rid.length() - minorVersionSeparatorIndex);
+            lastVersionSeparatorIndex = rid.find(_X("."), secondVersionSeparatorIndex + 1);
         }
     }
 
+    if (lastVersionSeparatorIndex != std::string::npos)
+    {
+        rid.erase(lastVersionSeparatorIndex, rid.length() - lastVersionSeparatorIndex);
+    }
+
     return rid;
 }
 
diff --git a/src/installer/init-tools.sh b/src/installer/init-tools.sh
index 7a2dec2..d6a6013 100755
--- a/src/installer/init-tools.sh
+++ b/src/installer/init-tools.sh
@@ -33,8 +33,15 @@ OSName=$(uname -s)
         Linux)
             __DOTNET_PKG=dotnet-dev-linux-x64
             OS=Linux
-			
-            if [ -e /etc/redhat-release ]; then
+
+            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
diff --git a/src/installer/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs b/src/installer/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs
index 936b0b4..d84a57b 100644
--- a/src/installer/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs
+++ b/src/installer/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs
@@ -151,11 +151,17 @@ namespace Microsoft.DotNet.PlatformAbstractions.Native
         private static DistroInfo NormalizeDistroInfo(DistroInfo distroInfo)
         {
             // Handle if VersionId is null by just setting the index to -1.
-            int minorVersionNumberSeparatorIndex = distroInfo.VersionId?.IndexOf('.') ?? -1;
+            int lastVersionNumberSeparatorIndex = distroInfo.VersionId?.IndexOf('.') ?? -1;
 
-            if (distroInfo.Id == "rhel" && minorVersionNumberSeparatorIndex != -1)
+            if (lastVersionNumberSeparatorIndex != -1 && distroInfo.Id == "alpine")
             {
-                distroInfo.VersionId = distroInfo.VersionId.Substring(0, minorVersionNumberSeparatorIndex);
+                // For Alpine, the version reported has three components, so we need to find the second version separator
+                lastVersionNumberSeparatorIndex = distroInfo.VersionId.IndexOf('.', lastVersionNumberSeparatorIndex + 1);
+            }
+
+            if (lastVersionNumberSeparatorIndex != -1 && (distroInfo.Id == "rhel" || distroInfo.Id == "alpine"))
+            {
+                distroInfo.VersionId = distroInfo.VersionId.Substring(0, lastVersionNumberSeparatorIndex);
             }
 
             return distroInfo;
-- 
2.7.4