track git master branch

install into any of installed discord packages (normal, ptb, canary)

3 files changed, 38 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e45b2ccf1f8e..ebc70c9f1dba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
-pkgbase = betterdiscord
-	pkgdesc = Discord extension that introduces new features like BTTV emotes and plugin support.
-	pkgver = 0.2.82
+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
 	pkgrel = 1
 	url = https://betterdiscord.net/home/
 	install = BetterDiscord.install
 	arch = any
 	license = MIT
+	makedepends = git
 	makedepends = asar
 	depends = discord
-	source = git+https://github.com/Jiiks/BetterDiscordApp.git#commit=0f2812bc10b3c9695ddf2e28b65bbfe1ae4d1ce7
+	source = betterdiscord::git+https://github.com/Jiiks/BetterDiscordApp.git
 	source = LICENSE
 	md5sums = SKIP
 	md5sums = 8414480728c5dc0d4ca9a93cfaf67acb
 
-pkgname = betterdiscord
+pkgname = betterdiscord-git
 
diff --git a/BetterDiscord.install b/BetterDiscord.install
index 7eaa9b1631aa..ef6f107bc691 100644
--- a/BetterDiscord.install
+++ b/BetterDiscord.install
@@ -1,33 +1,38 @@
 pre_install() {
-  pre_remove
+	pre_remove
 }
 
 post_install() {
-  echo ">>> Unpacking Discord asar..."
-  sudo asar e "/opt/discord/resources/app.asar" "/opt/discord/resources/app"
+	for discord_dir in /opt/discord{,-canary,-ptb}; do
+		if [ -d "$discord_dir" ]; then
+			echo ">> Installing into $discord_dir"
+			echo ">>> Unpacking Discord asar..."
+			sudo asar e "$discord_dir/resources/app.asar" "$discord_dir/resources/app"
 
-  echo ">>> Preparing Discord files..."
-  sed "/_fs2/ a var _betterDiscord = require('betterdiscord'); var _betterDiscord2;" "/opt/discord/resources/app/index.js" > "/usr/lib/betterdiscord/index.js"
-  sudo mv "/usr/lib/betterdiscord/index.js" "/opt/discord/resources/app/index.js"
-  sed "/mainWindow = new/ a _betterDiscord2 = new _betterDiscord.BetterDiscord(mainWindow);" "/opt/discord/resources/app/index.js" > "/usr/lib/betterdiscord/index.js"
-  sudo mv "/usr/lib/betterdiscord/index.js" "/opt/discord/resources/app/index.js"
+			echo ">>> Preparing Discord files..."
+			sed \
+				-e "/_fs2 = / a var _betterDiscord = require('betterdiscord'); var _betterDiscord2;" \
+				-e "/mainWindow = new/ a _betterDiscord2 = new _betterDiscord.BetterDiscord(mainWindow);" \
+				-i "$discord_dir/resources/app/index.js"
 
-  echo ">>> Finishing up..."
-  sudo ln -s "/usr/lib/betterdiscord/" "/opt/discord/resources/app/node_modules/betterdiscord"
+			echo ">>> Finishing up..."
+			sudo ln -s "/usr/lib/betterdiscord-git/" "$discord_dir/resources/app/node_modules/betterdiscord"
+		fi
+	done
 }
 
 pre_upgrade() {
-  pre_remove
+	pre_remove
 }
 
 post_upgrade() {
-  post_install
+	post_install
 }
 
 pre_remove() {
-  echo ">>> Killing Discord..."
-  killall -SIGKILL Discord
+	echo ">>> Killing Discord..."
+	killall -q -SIGKILL Discord DiscordCanary DiscordPTB
 
-  echo ">>> Removing app folder from Discord directory..."
-  sudo rm -rf "/opt/discord/resources/app"
+	echo ">>> Removing app folder from Discord directory..."
+	sudo rm -rf /opt/discord{,-canary,-ptb}/resources/app
 }
diff --git a/PKGBUILD b/PKGBUILD
index b53af5b84d7e..545f5c744898 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,30 @@
-# Maintainer: Ilya Trukhanov <lahvuun@gmail.com>
-#
-# This package is based on discorddownloader by simonizor
-# http://www.simonizor.gq/discorddownloader.html
-
-pkgname=betterdiscord
-pkgver=0.2.82
+pkgname=betterdiscord-git
+pkgver=0.2.82.r281.gb92989a
 pkgrel=1
-pkgdesc='Discord extension that introduces new features like BTTV emotes and plugin support.'
+pkgdesc='Discord extension that introduces new features like BTTV emotes and plugin support. Git master branch'
 arch=('any')
 url='https://betterdiscord.net/home/'
 license=('MIT')
 depends=('discord')
-makedepends=('asar')
+makedepends=('git' 'asar')
 install='BetterDiscord.install'
-source=('git+https://github.com/Jiiks/BetterDiscordApp.git#commit=0f2812bc10b3c9695ddf2e28b65bbfe1ae4d1ce7' LICENSE)
+source=("${pkgname%-git}::git+https://github.com/Jiiks/BetterDiscordApp.git" LICENSE)
 md5sums=('SKIP'
          '8414480728c5dc0d4ca9a93cfaf67acb')
 
+pkgver() {
+  cd "${srcdir}/${pkgname%-git}"
+  git describe --long --tags | sed 's/-/.r/;s/-/./'
+}
+
 package() {
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
   # Get rid of git files.
-  mkdir -p "package"
-  cp -rf "./BetterDiscordApp/" "./package/"
-  cd "./package/BetterDiscordApp/"
+  cd "${srcdir}/${pkgname%-git}"
   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"
 }