summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLahvuun2017-10-18 01:48:53 +0300
committerLahvuun2017-10-18 01:48:53 +0300
commit597bebc56a204e7ca9bf5045ee8f84430a0ff303 (patch)
tree4c4149932c0d620753de4c2ee246b17f76be6de8
parent1b9b032ece086f338a723e1d28e98fefbb8e7c1c (diff)
downloadaur-597bebc56a204e7ca9bf5045ee8f84430a0ff303.tar.gz
Bump version to the official 0.2.82 release; support -canary and -ptb
-rw-r--r--.SRCINFO4
-rw-r--r--BetterDiscord.install24
-rw-r--r--PKGBUILD4
3 files changed, 21 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e45b2ccf1f8..fca0a1bfb74 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
pkgbase = betterdiscord
pkgdesc = Discord extension that introduces new features like BTTV emotes and plugin support.
pkgver = 0.2.82
- pkgrel = 1
+ pkgrel = 2
url = https://betterdiscord.net/home/
install = BetterDiscord.install
arch = any
license = MIT
makedepends = asar
depends = discord
- source = git+https://github.com/Jiiks/BetterDiscordApp.git#commit=0f2812bc10b3c9695ddf2e28b65bbfe1ae4d1ce7
+ source = git+https://github.com/Jiiks/BetterDiscordApp.git#tag=0.2.82
source = LICENSE
md5sums = SKIP
md5sums = 8414480728c5dc0d4ca9a93cfaf67acb
diff --git a/BetterDiscord.install b/BetterDiscord.install
index 7eaa9b1631a..d9297d88dae 100644
--- a/BetterDiscord.install
+++ b/BetterDiscord.install
@@ -1,19 +1,29 @@
+DISCORDDIR=""
+
+if [[ -d "/opt/discord" ]]; then
+ DISCORDDIR="/opt/discord/"
+elif [[ -d "/opt/discord-canary" ]]; then
+ DISCORDDIR="/opt/discord-canary/"
+elif [[ -d "/opt/discord-ptb" ]]; then
+ DISCORDDIR="/opt/discord-ptb/"
+fi
+
pre_install() {
pre_remove
}
post_install() {
echo ">>> Unpacking Discord asar..."
- sudo asar e "/opt/discord/resources/app.asar" "/opt/discord/resources/app"
+ sudo asar e "${DISCORDDIR}resources/app.asar" "${DISCORDDIR}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"
+ sed "/_fs2/ a var _betterDiscord = require('betterdiscord'); var _betterDiscord2;" "${DISCORDDIR}resources/app/index.js" > "/usr/lib/betterdiscord/index.js"
+ sudo mv "/usr/lib/betterdiscord/index.js" "${DISCORDDIR}resources/app/index.js"
+ sed "/mainWindow = new/ a _betterDiscord2 = new _betterDiscord.BetterDiscord(mainWindow);" "${DISCORDDIR}resources/app/index.js" > "/usr/lib/betterdiscord/index.js"
+ sudo mv "/usr/lib/betterdiscord/index.js" "${DISCORDDIR}resources/app/index.js"
echo ">>> Finishing up..."
- sudo ln -s "/usr/lib/betterdiscord/" "/opt/discord/resources/app/node_modules/betterdiscord"
+ sudo ln -s "/usr/lib/betterdiscord/" "${DISCORDDIR}resources/app/node_modules/betterdiscord"
}
pre_upgrade() {
@@ -29,5 +39,5 @@ pre_remove() {
killall -SIGKILL Discord
echo ">>> Removing app folder from Discord directory..."
- sudo rm -rf "/opt/discord/resources/app"
+ sudo rm -rf "${DISCORDDIR}resources/app"
}
diff --git a/PKGBUILD b/PKGBUILD
index b53af5b84d7..7ad62999b90 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=betterdiscord
pkgver=0.2.82
-pkgrel=1
+pkgrel=2
pkgdesc='Discord extension that introduces new features like BTTV emotes and plugin support.'
arch=('any')
url='https://betterdiscord.net/home/'
@@ -13,7 +13,7 @@ license=('MIT')
depends=('discord')
makedepends=('asar')
install='BetterDiscord.install'
-source=('git+https://github.com/Jiiks/BetterDiscordApp.git#commit=0f2812bc10b3c9695ddf2e28b65bbfe1ae4d1ce7' LICENSE)
+source=('git+https://github.com/Jiiks/BetterDiscordApp.git#tag=0.2.82' LICENSE)
md5sums=('SKIP'
'8414480728c5dc0d4ca9a93cfaf67acb')