181.4952.297

4 files changed, 14 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c08b6db27b79..3ab78f92cede 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rider-eap
 	pkgdesc = A cross-platform C# IDE by JetBrains.
-	pkgver = 2018.1.EAP3.181.4035.533
+	pkgver = 181.4952.297
 	pkgrel = 1
 	epoch = 1
 	url = https://www.jetbrains.com/rider/
@@ -10,16 +10,15 @@ pkgbase = rider-eap
 	groups = editor
 	groups = jetbrains
 	license = custom
-	makedepends = wget
 	optdepends = mono: .NET runtime
 	optdepends = msbuild-15-bin: build .NET Core projects
 	provides = rider
 	conflicts = rider
 	options = !strip
-	source = https://download-cf.jetbrains.com/rider/JetBrains.Rider-2018.1-EAP3-181.4035.533.Checked.tar.gz
+	source = https://download.jetbrains.com/rider/JetBrains.Rider-2018.1.2.tar.gz
 	source = rider-eap.desktop
-	sha256sums = bd04d3973c8505d4ecc42b3b3d64ddb513041c53ee2f76fb8aff54379c937af1
-	sha256sums = f9311f901c27f3dc17dc9e9ede3698ccfda8f9e07a9827d174655e90d352e734
+	sha256sums = 8c154d731807014b956c2758e1551e0f902abe9a3a75fee488cc9d5dc90352cb
+	sha256sums = cbb7c9b847c92c95403be237ab01183eb0516b4a9b46c8ba27c87243fed8cbb8
 
 pkgname = rider-eap
 
diff --git a/.gitignore b/.gitignore
index 53fb9b4ecbac..686cbbf278c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,4 @@
-### https://raw.github.com/github/gitignore/fa441f903154d8159ef71db23d4816d802450fef/ArchLinuxPackages.gitignore
-
-*.tar
-*.tar.*
-*.jar
-*.exe
-*.msi
-*.zip
-*.tgz
-*.log
-*.log.*
-*.sig
-*.sw*
-
-pkg/
+*.tar.gz
+*.xz
 src/
-riderRS-*.tar.gz
-
-
+pkg/
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index dcb4d4aeedd6..bfad623c1186 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,10 +5,8 @@
 # Contributor: Andrey Vlasovskikh <andrey.vlasovskikh@gmail.com>
 
 pkgname=rider-eap
-_buildver=181.4035.533
-_pkgver=2018.1-EAP3
-_eap="True"
-pkgver="${_pkgver//-/.}.${_buildver}"
+pkgver=181.4952.297
+_dlver=2018.1.2
 pkgrel=1
 epoch=1
 pkgdesc="A cross-platform C# IDE by JetBrains."
@@ -17,16 +15,14 @@ options=('!strip')
 url="https://www.jetbrains.com/rider/"
 license=("custom")
 optdepends=('mono: .NET runtime' 'msbuild-15-bin: build .NET Core projects')
-makedepends=("wget")
 provides=("rider")
 conflicts=("rider")
 groups=("development" "IDE" "editor" "jetbrains")
 
-_srcfile="JetBrains.Rider-${_pkgver}-${_buildver}.Checked.tar.gz"
-source=("https://download-cf.jetbrains.com/rider/${_srcfile}"
+source=("https://download.jetbrains.com/rider/JetBrains.Rider-${_dlver}.tar.gz"
         "${pkgname}.desktop")
-sha256sums=('bd04d3973c8505d4ecc42b3b3d64ddb513041c53ee2f76fb8aff54379c937af1' # wget returns 403 for me causing build to fail
-            'f9311f901c27f3dc17dc9e9ede3698ccfda8f9e07a9827d174655e90d352e734')
+sha256sums=('8c154d731807014b956c2758e1551e0f902abe9a3a75fee488cc9d5dc90352cb'
+            'cbb7c9b847c92c95403be237ab01183eb0516b4a9b46c8ba27c87243fed8cbb8')
 
 package() {
     cd "${srcdir}"
@@ -35,18 +31,8 @@ package() {
         "${pkgdir}/usr/bin/" \
         "${pkgdir}/usr/share/applications/"
 
-    if [[ "True" = "${_eap}" ]]; then
-        cp -R --no-preserve=ownership "${srcdir}/JetBrains Rider-${_buildver}/"* "${pkgdir}/opt/${pkgname}"
-    # else
-    fi
+    cp -R --no-preserve=ownership "${srcdir}/JetBrains Rider-${_dlver}/"* "${pkgdir}/opt/${pkgname}"
 
-    if [[ "i686" = "${CARCH}" ]]; then
-        rm -f "${pkgdir}/opt/${pkgname}/bin/libyjpagent-linux64.so"
-        rm -f "${pkgdir}/opt/${pkgname}/bin/fsnotifier64"
-    fi
-
-    sed -i "s/Version=/Version=${pkgver}/g" "${pkgname}.desktop"
     install -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/"
-
     ln -s "/opt/${pkgname}/bin/rider.sh" "${pkgdir}/usr/bin/rider-eap"
 }
diff --git a/rider-eap.desktop b/rider-eap.desktop
index c5759f4b97a9..a99264c38785 100644
--- a/rider-eap.desktop
+++ b/rider-eap.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Rider EAP
-Version=
+Version=1.0
 Type=Application
 Exec="/opt/rider-eap/bin/rider.sh" %f
 Icon=/opt/rider-eap/bin/rider.png