feat: 🎸 Add support for multiple discord version and fix typo

10 files changed, 114 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 943f28e7cdca..705739cca60c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = openasar-git
 	pkgdesc = Open-source alternative of Discord desktop's app.asar
-	pkgver = r809.a8b0739
+	pkgver = r810.cd44357
 	pkgrel = 1
 	url = https://github.com/GooseMod/OpenAsar
 	install = openasar-git.install
@@ -12,17 +12,26 @@ pkgbase = openasar-git
 	makedepends = nodejs
 	depends = unzip
 	optdepends = discord
+	optdepends = discord-ptb
+	optdepends = discord-canary
+	optdepends = discord-development
 	provides = openasar
 	conflicts = openasar
 	source = git+https://github.com/GooseMod/OpenAsar.git
 	source = post-upgrade-discord
 	source = openasar-git-discord-upgrade.hook
+	source = openasar-git-discord-ptb-upgrade.hook
+	source = openasar-git-discord-canary-upgrade.hook
+	source = openasar-git-discord-development-upgrade.hook
 	source = pre-remove-discord
 	source = openasar-git-discord-remove.hook
 	sha1sums = SKIP
-	sha1sums = 7bc291ac6ba295ed707daeabcabb42da7b4ceedb
-	sha1sums = 275d5228ceb7c5d39c3d846a898b98624cbef02b
-	sha1sums = 99664e9a0b07f43052cb75d5ccdb8b5123134fbc
-	sha1sums = 9fa086af362a64a4b0a7f01c4235d3b4fdacad06
+	sha1sums = b649b6095fdf719d8124a877a47dbfaaed938039
+	sha1sums = bc184134bd132d14c8758e49e7e51ecec25c7347
+	sha1sums = 7444c2a0937e95e93c80b8647e1a5074c7ba3684
+	sha1sums = 4ad3c320455b7276bbf0d636160423ed68d4f907
+	sha1sums = 219ecd2ee201f6c73065415208717d1e2fd5e8ef
+	sha1sums = 1ee057b1413aae0131f841118467bbdf4954a04e
+	sha1sums = 8c0d5675af76b48575611b03c8e2f2a6a5ca8cde
 
 pkgname = openasar-git
diff --git a/PKGBUILD b/PKGBUILD
index 376279f7a1f1..425618646de1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Kamack38 <kamack38.biznes@gmail.com>
 _pkgname='openasar'
 pkgname="${_pkgname}-git"
-pkgver=r809.a8b0739
+pkgver=r810.cd44357
 pkgrel=1
 pkgdesc="Open-source alternative of Discord desktop's app.asar"
 arch=('i686' 'x86_64')
@@ -9,31 +9,37 @@ url="https://github.com/GooseMod/OpenAsar"
 license=('MIT')
 depends=('unzip')
 makedepends=('git' 'asar' 'nodejs')
-optdepends=('discord')
+optdepends=('discord' 'discord-ptb' 'discord-canary' 'discord-development')
 provides=("${_pkgname}")
 conflicts=("${_pkgname}")
-source=("git+${url}.git" "post-upgrade-discord" "openasar-git-discord-upgrade.hook" "pre-remove-discord" "openasar-git-discord-remove.hook")
+source=("git+${url}.git" "post-upgrade-discord" "openasar-git-discord-upgrade.hook" "openasar-git-discord-ptb-upgrade.hook" "openasar-git-discord-canary-upgrade.hook" "openasar-git-discord-development-upgrade.hook" "pre-remove-discord" "openasar-git-discord-remove.hook")
 sha1sums=('SKIP'
-          '7bc291ac6ba295ed707daeabcabb42da7b4ceedb'
-          '275d5228ceb7c5d39c3d846a898b98624cbef02b'
-          '99664e9a0b07f43052cb75d5ccdb8b5123134fbc'
-          '9fa086af362a64a4b0a7f01c4235d3b4fdacad06')
+          'b649b6095fdf719d8124a877a47dbfaaed938039'
+          'bc184134bd132d14c8758e49e7e51ecec25c7347'
+          '7444c2a0937e95e93c80b8647e1a5074c7ba3684'
+          '4ad3c320455b7276bbf0d636160423ed68d4f907'
+          '219ecd2ee201f6c73065415208717d1e2fd5e8ef'
+          '1ee057b1413aae0131f841118467bbdf4954a04e'
+          '8c0d5675af76b48575611b03c8e2f2a6a5ca8cde')
 install="$pkgname.install"
 
 pkgver() {
-    cd "${srcdir}/OpenAsar"
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	cd "${srcdir}/OpenAsar"
+	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 package() {
-    install -Dm755 "${srcdir}/post-upgrade-discord" -t "${pkgdir}/usr/share/libalpm/scripts/"
-    install -Dm755 "${srcdir}/pre-remove-discord" -t "${pkgdir}/usr/share/libalpm/scripts/"
-    install -Dm644 "${srcdir}/openasar-git-discord-remove.hook" -t "${pkgdir}/usr/share/libalpm/hooks/"
-    install -Dm644 "${srcdir}/openasar-git-discord-upgrade.hook" -t "${pkgdir}/usr/share/libalpm/hooks/"
-    cd "${srcdir}/OpenAsar"
-    install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    sed -i -e "s/nightly/nightly-$(git rev-parse HEAD | cut -c 1-7)/" src/index.js
-    node scripts/strip.js
-    asar pack src app.asar
-    install -Dm 644 app.asar "${pkgdir}/opt/${pkgname}/app.asar"
+	install -Dm755 "${srcdir}/post-upgrade-discord" -t "${pkgdir}/usr/share/libalpm/scripts/"
+	install -Dm755 "${srcdir}/pre-remove-discord" -t "${pkgdir}/usr/share/libalpm/scripts/"
+	install -Dm644 "${srcdir}/openasar-git-discord-remove.hook" -t "${pkgdir}/usr/share/libalpm/hooks/"
+	install -Dm644 "${srcdir}/openasar-git-discord-upgrade.hook" -t "${pkgdir}/usr/share/libalpm/hooks/"
+	install -Dm644 "${srcdir}/openasar-git-discord-ptb-upgrade.hook" -t "${pkgdir}/usr/share/libalpm/hooks/"
+	install -Dm644 "${srcdir}/openasar-git-discord-canary-upgrade.hook" -t "${pkgdir}/usr/share/libalpm/hooks/"
+	install -Dm644 "${srcdir}/openasar-git-discord-development-upgrade.hook" -t "${pkgdir}/usr/share/libalpm/hooks/"
+	cd "${srcdir}/OpenAsar"
+	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	sed -i -e "s/nightly/nightly-$(git rev-parse HEAD | cut -c 1-7)/" src/index.js
+	node scripts/strip.js
+	asar pack src app.asar
+	install -Dm 644 app.asar "${pkgdir}/opt/${pkgname}/app.asar"
 }
diff --git a/openasar-git-discord-canary-upgrade.hook b/openasar-git-discord-canary-upgrade.hook
new file mode 100644
index 000000000000..29670cd2148f
--- /dev/null
+++ b/openasar-git-discord-canary-upgrade.hook
@@ -0,0 +1,10 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Target = opt/discord-canary/resources/*
+
+[Action]
+Description = Replacing official asar with openasar...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/post-upgrade-discord discord-canary
diff --git a/openasar-git-discord-development-upgrade.hook b/openasar-git-discord-development-upgrade.hook
new file mode 100644
index 000000000000..ec1cb6fe7af0
--- /dev/null
+++ b/openasar-git-discord-development-upgrade.hook
@@ -0,0 +1,10 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Target = opt/discord-development/resources/*
+
+[Action]
+Description = Replacing official asar with openasar...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/post-upgrade-discord discord-development
diff --git a/openasar-git-discord-ptb-upgrade.hook b/openasar-git-discord-ptb-upgrade.hook
new file mode 100644
index 000000000000..5c607c3fca48
--- /dev/null
+++ b/openasar-git-discord-ptb-upgrade.hook
@@ -0,0 +1,10 @@
+[Trigger]
+Type = Path
+Operation = Install
+Operation = Upgrade
+Target = opt/discord-ptb/resources/*
+
+[Action]
+Description = Replacing official asar with openasar...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/post-upgrade-discord discord-ptb
diff --git a/openasar-git-discord-remove.hook b/openasar-git-discord-remove.hook
index 7173a81e1a68..d9b1708069f2 100644
--- a/openasar-git-discord-remove.hook
+++ b/openasar-git-discord-remove.hook
@@ -2,8 +2,12 @@
 Type = Package
 Operation = Remove
 Target = discord
+Target = discord-ptb
+Target = discord-canary
+Target = discord-development
 
 [Action]
-Description = Reverting to the offcial asar...
+NeedsTargets
+Description = Reverting to the official asar...
 When = PreTransaction
 Exec = /usr/share/libalpm/scripts/pre-remove-discord
diff --git a/openasar-git-discord-upgrade.hook b/openasar-git-discord-upgrade.hook
index 943b1a85e651..a226a6557925 100644
--- a/openasar-git-discord-upgrade.hook
+++ b/openasar-git-discord-upgrade.hook
@@ -5,6 +5,6 @@ Operation = Upgrade
 Target = opt/discord/resources/*
 
 [Action]
-Description = Replacing offcial asar with openasar...
+Description = Replacing official asar with openasar...
 When = PostTransaction
-Exec = /usr/share/libalpm/scripts/post-upgrade-discord
+Exec = /usr/share/libalpm/scripts/post-upgrade-discord discord
diff --git a/openasar-git.install b/openasar-git.install
index c39905fd7b80..b51dd360e684 100644
--- a/openasar-git.install
+++ b/openasar-git.install
@@ -1,32 +1,39 @@
+_pkgname='openasar'
+pkgname="${_pkgname}-git"
+variants=(
+	"discord"
+	"discord-ptb"
+	"discord-canary"
+	"discord-development"
+)
+
 post_install() {
-	_pkgname='openasar'
-	pkgname="${_pkgname}-git"
-	default_asar_path="${pkgdir}/opt/discord/resources/app.asar"
-	if [ -f "$default_asar_path" ]; then
-		cp "${default_asar_path}" "${default_asar_path}.backup"
-		cp "/opt/${pkgname}/app.asar" "${default_asar_path}"
-	fi
+	for variant in "${variants[@]}"; do
+		asar_path="/opt/${variant}/resources/app.asar"
+		if [ -f "${asar_path}" ]; then
+			mv "${asar_path}" "${asar_path}.backup"
+			cp -f "/opt/${pkgname}/app.asar" "${asar_path}"
+		fi
+	done
 }
 
 pre_upgrade() {
-	default_asar_path="${pkgdir}/opt/discord/resources/app.asar"
-	if [ -f "$default_asar_path" ]; then
-		rm "${default_asar_path}"
-	fi
+	for variant in "${variants[@]}"; do
+		rm -rf "/opt/${variant}/resources/app.asar"
+	done
 }
 
 post_upgrade() {
-	_pkgname='openasar'
-	pkgname="${_pkgname}-git"
-	default_asar_path="${pkgdir}/opt/discord/resources/app.asar"
-	if [ -f "${default_asar_path}.backup" ]; then
-		cp "/opt/${pkgname}/app.asar" "/opt/discord/resources/app.asar"
-	fi
+	for variant in "${variants[@]}"; do
+		cp -f "/opt/${pkgname}/app.asar" "/opt/${variant}/resources/app.asar"
+	done
 }
 
 post_remove() {
-	default_asar_path="/opt/discord/resources/app.asar"
-	if [ -f "${default_asar_path}.backup" ]; then
-		mv "${default_asar_path}.backup" "${default_asar_path}"
-	fi
+	for variant in "${variants[@]}"; do
+		asar_path="/opt/${variant}/resources/app.asar"
+		if [ -f "${asar_path}.backup" ]; then
+			mv "${asar_path}.backup" "${asar_path}"
+		fi
+	done
 }
diff --git a/post-upgrade-discord b/post-upgrade-discord
index c65e25b4f861..4e27bdc10ad5 100644
--- a/post-upgrade-discord
+++ b/post-upgrade-discord
@@ -1,3 +1,5 @@
 #!/bin/bash
-mv /opt/discord/resources/app.asar /opt/discord/resources/app.asar.backup
+variant="$1"
+asar_path="/opt/${variant}/resources/app.asar"
+mv "${asar_path}" "${asar_path}.backup"
 install -Dm 644 /opt/openasar-git/app.asar /opt/discord/resources/app.asar
diff --git a/pre-remove-discord b/pre-remove-discord
index 0d213adb57b4..7b151e4e4535 100644
--- a/pre-remove-discord
+++ b/pre-remove-discord
@@ -1,2 +1,8 @@
 #!/bin/bash
-mv /opt/discord/resources/app.asar.backup /opt/discord/resources/app.asar
+while read -r variant; do
+	asar_path="/opt/${variant}/resources/app.asar"
+	if [ -f "${asar_path}.backup" ]; then
+		echo "Removing openasar for $variant"
+		mv "${asar_path}.backup" "${asar_path}"
+	fi
+done