Remove unneeded dotnet.sh; fix libhostfxr symlink; cleanup

3 files changed, 59 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c26b39a2113b..a9c42667e618 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,12 @@
 pkgbase = dotnet-core-preview
 	pkgver = 5.0.0+100+preview.7.20366.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.microsoft.com/net/core
 	arch = x86_64
 	arch = armv7h
 	arch = aarch64
 	license = MIT
 	options = staticlibs
-	source = dotnet.sh
-	sha512sums = 448e2ad41a1ac5b7adf4a17ef27d01d1f20c6d355fdb1e10b0ceb4bd6edd8b3a24874aa8c42cfcf56267a6a85c5896b5f69764e5e59526f6938ec7c9d1ec7383
 	source_x86_64 = https://download.visualstudio.microsoft.com/download/pr/6e9bdda1-72b5-4d2e-8908-be9321b8db26/cbc8ab6c3a1aca2a8dd92e272edd3293/dotnet-sdk-5.0.100-preview.7.20366.6-linux-x64.tar.gz
 	sha512sums_x86_64 = a1369d4e9e6281a3656acf6ba8357fbb9b25824fa63b42b55700f4d7ab58b2dc355b91c356a13c7d76da92e30dd3a5ccefd1d3396eacc1ac62cbae608b5eed86
 	source_armv7h = https://download.visualstudio.microsoft.com/download/pr/20349622-b776-4fa0-a981-adacd7d57b9c/174f26a811b61a11a2132613e27f442a/dotnet-sdk-5.0.100-preview.7.20366.6-linux-arm.tar.gz
@@ -18,6 +16,7 @@ pkgbase = dotnet-core-preview
 
 pkgname = dotnet-host-preview
 	pkgdesc = A generic driver for the .NET Core Command Line Interface (preview, binary)
+	depends = glibc
 	provides = dotnet-host
 	provides = dotnet-host=5.0.0
 	conflicts = dotnet-host
@@ -25,27 +24,24 @@ pkgname = dotnet-host-preview
 pkgname = aspnet-runtime-preview
 	pkgdesc = The ASP.NET Core runtime (preview, binary)
 	depends = dotnet-runtime-preview
-	provides = aspnet-runtime-preview
 	provides = aspnet-runtime=5.0.0
 	provides = aspnet-runtime-5.0
-	conflicts = aspnet-runtime-preview
 	conflicts = aspnet-runtime=5.0.0
 	conflicts = aspnet-runtime-5.0
 
 pkgname = dotnet-runtime-preview
 	pkgdesc = The .NET Core runtime (preview, binary)
 	depends = dotnet-host>=5.0.0
+	depends = glibc
 	depends = icu
 	depends = krb5
+	depends = libcurl.so
 	depends = libunwind
 	depends = openssl
 	depends = zlib
-	depends = libcurl.so
 	optdepends = lttng-ust: CoreCLR tracing
-	provides = dotnet-runtime-preview
 	provides = dotnet-runtime=5.0.0
 	provides = dotnet-runtime-5.0
-	conflicts = dotnet-runtime-preview
 	conflicts = dotnet-runtime=5.0.0
 	conflicts = dotnet-runtime-5.0
 
@@ -54,10 +50,8 @@ pkgname = dotnet-sdk-preview
 	depends = dotnet-sdk-3.1
 	depends = dotnet-runtime-preview
 	depends = glibc
-	provides = dotnet-sdk-preview
 	provides = dotnet-sdk=5.0.100
 	provides = dotnet-sdk-5.0
-	conflicts = dotnet-sdk-preview
 	conflicts = dotnet-sdk=5.0.100
 	conflicts = dotnet-sdk-5.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 817145dbb73c..e034fd682c1f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,69 +4,87 @@
 # Contributor: Attila Greguss <floyd0122[at]gmail[dot]com>
 
 pkgbase=dotnet-core-preview
-pkgname=('dotnet-host-preview' 'aspnet-runtime-preview' 'dotnet-runtime-preview' 'dotnet-sdk-preview')
+pkgname=(
+  dotnet-host-preview
+  aspnet-runtime-preview
+  dotnet-runtime-preview
+  dotnet-sdk-preview
+)
 pkgver=5.0.0+100+preview.7.20366.6
+_hostver=5.0.0-preview.7.20364.11
 _runtimever=5.0.0-preview.7.20365.19
 _sdkver=5.0.100-preview.7.20366.6
-pkgrel=1
-arch=('x86_64' 'armv7h' 'aarch64')
-url='https://www.microsoft.com/net/core'
-license=('MIT')
-options=('staticlibs')
-source=('dotnet.sh')
-source_x86_64=('https://download.visualstudio.microsoft.com/download/pr/6e9bdda1-72b5-4d2e-8908-be9321b8db26/cbc8ab6c3a1aca2a8dd92e272edd3293/dotnet-sdk-5.0.100-preview.7.20366.6-linux-x64.tar.gz')
-source_armv7h=('https://download.visualstudio.microsoft.com/download/pr/20349622-b776-4fa0-a981-adacd7d57b9c/174f26a811b61a11a2132613e27f442a/dotnet-sdk-5.0.100-preview.7.20366.6-linux-arm.tar.gz')
-source_aarch64=('https://download.visualstudio.microsoft.com/download/pr/a7d933ce-5f1d-4c7b-a388-509ee6ee710c/152fa9acb7ee9cf34d7cb0eeeb36d448/dotnet-sdk-5.0.100-preview.7.20366.6-linux-arm64.tar.gz')
-sha512sums=('448e2ad41a1ac5b7adf4a17ef27d01d1f20c6d355fdb1e10b0ceb4bd6edd8b3a24874aa8c42cfcf56267a6a85c5896b5f69764e5e59526f6938ec7c9d1ec7383')
-sha512sums_x86_64=('a1369d4e9e6281a3656acf6ba8357fbb9b25824fa63b42b55700f4d7ab58b2dc355b91c356a13c7d76da92e30dd3a5ccefd1d3396eacc1ac62cbae608b5eed86')
-sha512sums_armv7h=('2e473ba7d2ed706313a02438da2b338fa91785cbbd68d1c15268641b3d547b7183e9f5be02df8f6d2af537e02280dae94cee63a4d3dd42bfbfb3cb4ce5fade59')
-sha512sums_aarch64=('34cc65a879c8dedf854e0bb5b8b3f415c7db1ea9281a868516b6c0fdbb6d356dbd41ca258c10aec0c33339a5bc3be6cdf4e4d96099b6e3f73abb841e9c8d2dae')
+pkgrel=2
+arch=(x86_64 armv7h aarch64)
+url=https://www.microsoft.com/net/core
+license=(MIT)
+options=(staticlibs)
+source_x86_64=(https://download.visualstudio.microsoft.com/download/pr/6e9bdda1-72b5-4d2e-8908-be9321b8db26/cbc8ab6c3a1aca2a8dd92e272edd3293/dotnet-sdk-5.0.100-preview.7.20366.6-linux-x64.tar.gz)
+source_armv7h=(https://download.visualstudio.microsoft.com/download/pr/20349622-b776-4fa0-a981-adacd7d57b9c/174f26a811b61a11a2132613e27f442a/dotnet-sdk-5.0.100-preview.7.20366.6-linux-arm.tar.gz)
+source_aarch64=(https://download.visualstudio.microsoft.com/download/pr/a7d933ce-5f1d-4c7b-a388-509ee6ee710c/152fa9acb7ee9cf34d7cb0eeeb36d448/dotnet-sdk-5.0.100-preview.7.20366.6-linux-arm64.tar.gz)
+sha512sums_x86_64=(a1369d4e9e6281a3656acf6ba8357fbb9b25824fa63b42b55700f4d7ab58b2dc355b91c356a13c7d76da92e30dd3a5ccefd1d3396eacc1ac62cbae608b5eed86)
+sha512sums_armv7h=(2e473ba7d2ed706313a02438da2b338fa91785cbbd68d1c15268641b3d547b7183e9f5be02df8f6d2af537e02280dae94cee63a4d3dd42bfbfb3cb4ce5fade59)
+sha512sums_aarch64=(34cc65a879c8dedf854e0bb5b8b3f415c7db1ea9281a868516b6c0fdbb6d356dbd41ca258c10aec0c33339a5bc3be6cdf4e4d96099b6e3f73abb841e9c8d2dae)
 
 package_dotnet-host-preview() {
   pkgdesc='A generic driver for the .NET Core Command Line Interface (preview, binary)'
-  provides=('dotnet-host' "dotnet-host=${_runtimever%-*}")
-  conflicts=('dotnet-host')
+  depends=(glibc)
+  provides=(dotnet-host dotnet-host=${_hostver%-*})
+  conflicts=(dotnet-host)
 
   install -dm 755 "${pkgdir}"/usr/{bin,lib,share/{dotnet,licenses/dotnet-host-preview}}
   cp -dr --no-preserve='ownership' dotnet host "${pkgdir}"/usr/share/dotnet/
   cp -dr --no-preserve='ownership' LICENSE.txt ThirdPartyNotices.txt "${pkgdir}"/usr/share/licenses/dotnet-host-preview
-  install -Dm 755 "${srcdir}"/dotnet.sh "${pkgdir}"/usr/share/dotnet
-  ln -sf /usr/share/dotnet/dotnet.sh "${pkgdir}"/usr/bin/dotnet
-  ln -sf /usr/share/dotnet/host/fxr/"${_runtimever}"/libhostfxr.so "${pkgdir}"/usr/lib/libhostfxr.so
+  ln -sf /usr/share/dotnet/dotnet "${pkgdir}"/usr/bin/dotnet
+  ln -sf /usr/share/dotnet/host/fxr/"${_hostver}"/libhostfxr.so "${pkgdir}"/usr/lib/libhostfxr.so
 }
 
 package_dotnet-runtime-preview() {
   pkgdesc='The .NET Core runtime (preview, binary)'
-  depends=("dotnet-host>=${_runtimever%-*}" 'icu' 'krb5' 'libunwind' 'openssl' 'zlib'
-           'libcurl.so')
+  depends=(
+    "dotnet-host>=${_hostver%-*}"
+    glibc 
+    icu
+    krb5
+    libcurl.so
+    libunwind
+    openssl
+    zlib
+  )
+
   optdepends=('lttng-ust: CoreCLR tracing')
-  provides=("dotnet-runtime-preview" "dotnet-runtime=${_runtimever%-*}" "dotnet-runtime-5.0")
-  conflicts=("dotnet-runtime-preview" "dotnet-runtime=${_runtimever%-*}" "dotnet-runtime-5.0")
+  provides=(dotnet-runtime=${_runtimever%-*} dotnet-runtime-5.0)
+  conflicts=(dotnet-runtime=${_runtimever%-*} dotnet-runtime-5.0)
 
   install -dm 755 "${pkgdir}"/usr/share/{dotnet/shared,licenses}
   cp -dr --no-preserve='ownership' shared/Microsoft.NETCore.App "${pkgdir}"/usr/share/dotnet/shared/
   ln -s dotnet-host-preview "${pkgdir}"/usr/share/licenses/dotnet-runtime-preview
 }
 
-package_aspnet-runtime-preview() {
-  pkgdesc='The ASP.NET Core runtime (preview, binary)'
-  depends=('dotnet-runtime-preview')
-  provides=("aspnet-runtime-preview" "aspnet-runtime=${_runtimever%-*}" "aspnet-runtime-5.0")
-  conflicts=("aspnet-runtime-preview" "aspnet-runtime=${_runtimever%-*}" "aspnet-runtime-5.0")
-
-  install -dm 755 "${pkgdir}"/usr/share/{dotnet/shared,licenses}
-  cp -dr --no-preserve='ownership' shared/Microsoft.AspNetCore.App "${pkgdir}"/usr/share/dotnet/shared/
-  ln -s dotnet-host-preview "${pkgdir}"/usr/share/licenses/aspnet-runtime-preview
-}
-
 package_dotnet-sdk-preview() {
   pkgdesc='The .NET Core SDK (preview, binary)'
-  depends=('dotnet-sdk-3.1' 'dotnet-runtime-preview' 'glibc')
-  provides=("dotnet-sdk-preview" "dotnet-sdk=${_sdkver%-*}" "dotnet-sdk-5.0")
-  conflicts=("dotnet-sdk-preview" "dotnet-sdk=${_sdkver%-*}" "dotnet-sdk-5.0")
+  depends=(
+    dotnet-sdk-3.1
+    dotnet-runtime-preview
+    glibc
+  )
+
+  provides=(dotnet-sdk=${_sdkver%-*} dotnet-sdk-5.0)
+  conflicts=(dotnet-sdk=${_sdkver%-*} dotnet-sdk-5.0)
 
   install -dm 755 "${pkgdir}"/usr/share/{dotnet,dotnet/packs,licenses}
   cp -dr --no-preserve='ownership' sdk templates "${pkgdir}"/usr/share/dotnet/
   cp -dr --no-preserve='ownership' packs/{Microsoft.AspNetCore.App.Ref,Microsoft.NETCore.App.Host.linux-x64,Microsoft.NETCore.App.Ref} "${pkgdir}"/usr/share/dotnet/packs/
   ln -s dotnet-host-preview "${pkgdir}"/usr/share/licenses/dotnet-sdk-preview
 }
+
+package_aspnet-runtime-preview() {
+  pkgdesc='The ASP.NET Core runtime (preview, binary)'
+  depends=(dotnet-runtime-preview)
+  provides=(aspnet-runtime=${_runtimever%-*} aspnet-runtime-5.0)
+  conflicts=(aspnet-runtime=${_runtimever%-*} aspnet-runtime-5.0)
+
+  install -dm 755 "${pkgdir}"/usr/share/{dotnet/shared,licenses}
+  cp -dr --no-preserve='ownership' shared/Microsoft.AspNetCore.App "${pkgdir}"/usr/share/dotnet/shared/
+  ln -s dotnet-host-preview "${pkgdir}"/usr/share/licenses/aspnet-runtime-preview
+}
diff --git a/dotnet.sh b/dotnet.sh
deleted file mode 100755
index bea68a5ea98b..000000000000
--- a/dotnet.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-export DOTNET_ROOT=/usr/share/dotnet
-exec /usr/share/dotnet/dotnet "$@"
\ No newline at end of file