From 17ef978c17eaebafb2734503444dfaa569acac77 Mon Sep 17 00:00:00 2001
From: Botspot <j.allen.marchand@outlook.com>
Date: Wed, 7 Apr 2021 09:49:58 -0500
Subject: [PATCH] Discord app update to spacingbat's webcord to close #541

---
 apps/Discord/description |  7 +++----
 apps/Discord/install-32  | 28 ++++++++++++----------------
 apps/Discord/install-64  | 28 ++++++++++++----------------
 apps/Discord/uninstall   |  2 +-
 4 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/apps/Discord/description b/apps/Discord/description
index 2e95aef..bf7a340 100644
--- a/apps/Discord/description
+++ b/apps/Discord/description
@@ -1,6 +1,5 @@
-Nativefier version of Discord for ARM
-To run: Menu -> Internet -> Discord.
-To run in a terminal: /usr/share/discord-linux-armv7l/discord
-You could also run it from the desktop shortcut.
+Fast Discord client for ARM that mimics the official Discord client.
+To run: Menu -> Internet -> WebCord.
+To run in a terminal: webcord
 The app runs independent to chromium and can be hidden to the system tray unlike other solutions out there.
 Made by SpacingBat3 on Github with care :)
diff --git a/apps/Discord/install-32 b/apps/Discord/install-32
index ab98363..0f0c97b 100755
--- a/apps/Discord/install-32
+++ b/apps/Discord/install-32
@@ -7,21 +7,17 @@ function error {
   exit 1
 }
 
-function download() {
-  curl -s https://api.github.com/repos/SpacingBat3/electron-discord-webapp/releases/latest \
-  | grep "browser_download_url.*armhf.deb" \
-  | cut -d : -f 2,3 \
-  | tr -d \" \
-  | wget -qi -
-}
+version='1.3.0'
+
+#remove electron-discord-webapp if it still exists
+if command -v electron-discord-webapp >/dev/null ;then
+  sudo apt purge electron-discord-webapp || error "failed to first uninstall electron-discord-webapp!"
+fi
+
+echo "Downloading Webcord..."
 
-gio trash ~/discord-electron 2> /dev/null
-rm -f ~/.local/share/applications/discord.desktop 2> /dev/null
+rm -f ~/webcord_${version}_armhf.deb
+wget https://github.com/SpacingBat3/electron-discord-webapp/releases/download/v${version}/webcord_${version}_armhf.deb
+sudo apt -fy install ~/webcord_${version}_armhf.deb || error "Failed to install webcord deb!"
 
-echo "downloading discord-electron..."
-cd $HOME
-#download || error "Failed to download latest release!"
-wget https://github.com/SpacingBat3/electron-discord-webapp/releases/download/v1.2.1/electron-discord-webapp_1.2.1_armhf.deb
-sudo dpkg -i electron-discord-webapp*armhf.deb || error "Failed to install discord-electron!"
-sudo apt -fy install
-rm -f electron-discord-webapp*armhf.deb
+rm -f ~/webcord_${version}_armhf.deb
diff --git a/apps/Discord/install-64 b/apps/Discord/install-64
index b534214..29d1689 100755
--- a/apps/Discord/install-64
+++ b/apps/Discord/install-64
@@ -7,21 +7,17 @@ function error {
   exit 1
 }
 
-function download() {
-  curl -s https://api.github.com/repos/SpacingBat3/electron-discord-webapp/releases/latest \
-  | grep "browser_download_url.*arm64.deb" \
-  | cut -d : -f 2,3 \
-  | tr -d \" \
-  | wget -qi -
-}
+version='1.3.0'
+
+#remove electron-discord-webapp if it still exists
+if command -v electron-discord-webapp >/dev/null ;then
+  sudo apt purge electron-discord-webapp || error "failed to first uninstall electron-discord-webapp!"
+fi
+
+echo "Downloading Webcord..."
 
-gio trash ~/discord-electron 2> /dev/null
-rm -f ~/.local/share/applications/discord.desktop 2> /dev/null
+rm -f ~/webcord_${version}_arm64.deb
+wget https://github.com/SpacingBat3/electron-discord-webapp/releases/download/v${version}/webcord_${version}_arm64.deb
+sudo apt -fy install ~/webcord_${version}_arm64.deb || error "Failed to install webcord deb!"
 
-echo "downloading discord-electron..."
-cd $HOME
-#download || error "Failed to download latest release!"
-wget https://github.com/SpacingBat3/electron-discord-webapp/releases/download/v1.2.1/electron-discord-webapp_1.2.1_arm64.deb
-sudo dpkg -i electron-discord-webapp*arm64.deb || error "Failed to install discord-electron!"
-sudo apt -f install
-rm -f electron-discord-webapp*arm64.deb
+rm -f ~/webcord_${version}_arm64.deb
diff --git a/apps/Discord/uninstall b/apps/Discord/uninstall
index 8047b92..288360c 100755
--- a/apps/Discord/uninstall
+++ b/apps/Discord/uninstall
@@ -6,4 +6,4 @@ function error {
   echo -e "\\e[91m$1\\e[39m"
   exit 1
 }
-sudo apt purge -y electron-discord-webapp
+sudo apt purge -y webcord