Updated: PKGBUILD

2 files changed, 23 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ebc70c9f1dba..f03fc7868e08 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = betterdiscord-git
-	pkgdesc = Discord extension that introduces new features like BTTV emotes and plugin support. Git master branch
-	pkgver = 0.2.82.r281.gb92989a
+	pkgdesc = Discord extension that introduces new features like BTTV emotes and plugin support (Git)
+	pkgver = 0.3.0i.r20.g4707671
 	pkgrel = 1
 	url = https://betterdiscord.net/home/
 	install = BetterDiscord.install
@@ -9,10 +9,12 @@ pkgbase = betterdiscord-git
 	makedepends = git
 	makedepends = asar
 	depends = discord
+	provides = betterdiscord
+	conflicts = betterdiscord
 	source = betterdiscord::git+https://github.com/Jiiks/BetterDiscordApp.git
 	source = LICENSE
-	md5sums = SKIP
-	md5sums = 8414480728c5dc0d4ca9a93cfaf67acb
+	sha512sums = SKIP
+	sha512sums = e2bb20271117ebef69eab2d505204dcfb83334e596c5ce02e5f5e1950ba502b9485ebb2005f9df74ac692ba4a99cce869942611b07bba4d588247d53bd21efcc
 
 pkgname = betterdiscord-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 545f5c744898..58ee525472ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,9 @@
+# Maintainer: Felix Golatofski <contact@xdfr.de>
+
 pkgname=betterdiscord-git
-pkgver=0.2.82.r281.gb92989a
+pkgver=0.3.0i.r20.g4707671
 pkgrel=1
-pkgdesc='Discord extension that introduces new features like BTTV emotes and plugin support. Git master branch'
+pkgdesc='Discord extension that introduces new features like BTTV emotes and plugin support (Git)'
 arch=('any')
 url='https://betterdiscord.net/home/'
 license=('MIT')
@@ -9,22 +11,31 @@ depends=('discord')
 makedepends=('git' 'asar')
 install='BetterDiscord.install'
 source=("${pkgname%-git}::git+https://github.com/Jiiks/BetterDiscordApp.git" LICENSE)
-md5sums=('SKIP'
-         '8414480728c5dc0d4ca9a93cfaf67acb')
+sha512sums=('SKIP'
+            'e2bb20271117ebef69eab2d505204dcfb83334e596c5ce02e5f5e1950ba502b9485ebb2005f9df74ac692ba4a99cce869942611b07bba4d588247d53bd21efcc')
+provides=('betterdiscord')
+conflicts=('betterdiscord')
 
 pkgver() {
   cd "${srcdir}/${pkgname%-git}"
-  git describe --long --tags | sed 's/-/.r/;s/-/./'
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 package() {
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
   # Get rid of git files.
-  cd "${srcdir}/${pkgname%-git}"
+  mkdir -p "package"
+  cp -rf "./betterdiscord/" "./package/"
+  cd "./package/betterdiscord/"
   rm -rf ".git"
   rm "./.gitignore"
 
   install -d "${pkgdir}/usr/lib/${pkgname}/"
   cp -a "./." "${pkgdir}/usr/lib/${pkgname}"
+  mv "${pkgdir}/usr/lib/${pkgname}/lib/Utils.js" "${pkgdir}/usr/lib/${pkgname}/lib/utils.js"
+
+  # Patch BetterDiscord files.
+  sed -i "s/'\/var\/local'/process.env.HOME + '\/.config'/g" "${pkgdir}/usr/lib/${pkgname}/lib/BetterDiscord.js"
+  sed -i "s/bdstorage/bdStorage/g" "${pkgdir}/usr/lib/${pkgname}/lib/BetterDiscord.js"
 }