1 files changed, 21 insertions, 16 deletions
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
 }