summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Horn2022-03-10 15:15:50 +0100
committerJonathan Horn2022-03-10 15:15:50 +0100
commite1a9b3d936ecff86f40fbff7be4db559aeac5703 (patch)
tree234f6bcc7b30dcc2dc25ef1d2bd7f493e2a74768
parent33bcdfa9592b21d1d33317b5a8ba3a094f84b388 (diff)
downloadaur-e1a9b3d936ecff86f40fbff7be4db559aeac5703.tar.gz
Remove relinking of packaged runtime as that seems to break some functionality, see RIDER-75057
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD26
2 files changed, 2 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index db6c8bf3536a..dcb05559e065 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = rider-eap
pkgdesc = A cross-platform .NET IDE by JetBrains.
pkgver = 221.4906.10
- pkgrel = 1
+ pkgrel = 2
epoch = 1
url = https://www.jetbrains.com/rider/eap/
arch = any
diff --git a/PKGBUILD b/PKGBUILD
index d6b77e3f4875..ef4171a3de72 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ eapver=2022.1
eaprelease=5
pkgver=221.4906.10
_dlver="${eapver}-EAP${eaprelease}-${pkgver}.Checked"
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc="A cross-platform .NET IDE by JetBrains."
arch=('any')
@@ -41,30 +41,6 @@ package() {
cp -R --no-preserve=ownership "${srcdir}/JetBrains Rider-${pkgver}/"* "${pkgdir}/usr/share/${pkgname}"
cp -R --no-preserve=ownership "${srcdir}/JetBrains Rider-${pkgver}/license/"* "${pkgdir}/usr/share/licenses/${pkgname}"
- if [ -n ${DOTNET_ROOT} ]; then
- # assumption if DOTNET_ROOT is set, we will use that version instead of the bundled version
- runtimeFolder=$(${srcdir}/../ResharperHost-runtime-folder.sh)
- find ${pkgdir}/usr/share/${pkgname}/lib/ReSharperHost -maxdepth 1 -type d \( -name "*-x64*" -or -name "*-arm*" -or -name "*-x86*" \) -and -not \( -name "*symref" -or -name "$runtimeFolder" \) -exec rm -rf {} \;
-
- #dotnet
- if [ -f "${DOTNET_ROOT}/dotnet" ]; then
- rm "${pkgdir}/usr/share/${pkgname}/lib/ReSharperHost/${runtimeFolder}/dotnet"/dotnet
- ln -s "${DOTNET_ROOT}"/dotnet "${pkgdir}/usr/share/${pkgname}/lib/ReSharperHost/${runtimeFolder}/dotnet"/dotnet
- fi
-
- #host
- if [ -d "${DOTNET_ROOT}/host" ]; then
- rm -rf "${pkgdir}/usr/share/${pkgname}/lib/ReSharperHost/${runtimeFolder}/dotnet"/host
- ln -s "${DOTNET_ROOT}"/host "${pkgdir}/usr/share/${pkgname}/lib/ReSharperHost/${runtimeFolder}/dotnet"/host
- fi
-
- #shared
- if [ -d "${DOTNET_ROOT}/shared" ]; then
- rm -rf "${pkgdir}/usr/share/${pkgname}/lib/ReSharperHost/${runtimeFolder}/dotnet"/shared
- ln -s "${DOTNET_ROOT}"/shared "${pkgdir}/usr/share/${pkgname}/lib/ReSharperHost/${runtimeFolder}/dotnet"/shared
- fi
- fi
-
install -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/"
ln -s "/usr/share/${pkgname}/bin/rider.sh" "${pkgdir}/usr/bin/rider-eap"
}