From bf699260f45259dfca8b7ab78d1adccb6e0f304e Mon Sep 17 00:00:00 2001
From: Botspot <j.allen.marchand@outlook.com>
Date: Mon, 26 Oct 2020 16:36:45 -0500
Subject: [PATCH] update Discord app

---
 apps/Discord/credits   |  2 --
 apps/Discord/install   | 42 ++++++++++++------------------------------
 apps/Discord/uninstall |  2 +-
 apps/Discord/website   |  2 +-
 4 files changed, 14 insertions(+), 34 deletions(-)
 delete mode 100644 apps/Discord/credits

diff --git a/apps/Discord/credits b/apps/Discord/credits
deleted file mode 100644
index 35ec90f..0000000
--- a/apps/Discord/credits
+++ /dev/null
@@ -1,2 +0,0 @@
-Install script written by RaspberryPiNews on YT
-Original program made by SpacingBat3 on Github
\ No newline at end of file
diff --git a/apps/Discord/install b/apps/Discord/install
index d04b9f4..9472c2b 100755
--- a/apps/Discord/install
+++ b/apps/Discord/install
@@ -7,37 +7,18 @@ function error {
   exit 1
 }
 
-arch=''
-while [ "$arch" != 'armhf' ] && [ "$arch" != 'arm64' ]
-do
-  echo -n "Which type of Discord do you want? [armhf/arm64] "
-  arch=''
-  read arch
-  if [ "$arch" != 'armhf' ] && [ "$arch" != 'arm64' ];then
-    echo -e "\\e[91mDid not understand '$arch'. Try again.\\e[39m"
-  fi
-done
-
-#maker and enter discord-electron folder
-gio trash ~/discord-electron
-mkdir ~/discord-electron
-cd ~/discord-electron || error "Failed to enter discord-electron folder!"
-
-if [ "$arch" == 'armhf' ];then
-  #Download from github
-  wget https://github.com/SpacingBat3/discord-electron/releases/download/0.2.0/linux-armv7l.tar.gz || error 'Failed to download archive!'
-  
-  tar -xf linux-armv7l.tar.gz || error 'Failed to extract archive!'
-  rm -f linux-armv7l.tar.gz
-elif [ "$arch" == 'armhf' ];then
-  #Download from github
-  wget https://github.com/SpacingBat3/discord-electron/releases/download/0.2.0/linux-arm64.tar.gz || error 'Failed to download archive!'
-  
-  tar -xf linux-arm64.tar.gz || error 'Failed to extract archive!'
-  rm -f linux-armv7l.tar.gz
+git clone https://github.com/SpacingBat3/electron-discord-webapp || error "Failed to download repo!"
+
+if [ ! -f /usr/bin/npm ];then
+  echo "npm is not installed. Installing npm now..."
+  "${DIRECTORY}/pkg-install" "npm" "$(dirname "$0")" || exit 1
+  echo "Updating npm to latest version..."
+  sudo npm install -g npm || error "failed to update npm to latest version!"
 fi
 
-cd $HOME
+cd electron-discord-webapp
+
+npm install
 
 #Create desktop shortcut
 echo "[Desktop Entry]
@@ -45,7 +26,8 @@ StartupNotify=true
 Terminal=false
 Type=Application
 Name=Discord
-Exec=${HOME}/discord-electron/discord-electron
+Path=$HOME/electron-discord-webapp
+Exec=npm start
 Icon=/home/pi/pi-apps/apps/Discord/icon-64.png
 Categories=Network;Chat;VideoConference;WebApp;Internet
 Comment=Your place to talk!
diff --git a/apps/Discord/uninstall b/apps/Discord/uninstall
index 561e4d8..5653d72 100755
--- a/apps/Discord/uninstall
+++ b/apps/Discord/uninstall
@@ -7,5 +7,5 @@ function error {
   exit 1
 }
 
-rm -rf  ~/discord-electron
+gio trash ~/electron-discord-webapp
 rm -f ~/.local/share/applications/discord.desktop
diff --git a/apps/Discord/website b/apps/Discord/website
index 18becf1..5109dde 100644
--- a/apps/Discord/website
+++ b/apps/Discord/website
@@ -1 +1 @@
-https://github.com/SpacingBat3/nativefier-discord-arm
+https://github.com/SpacingBat3/electron-discord-webapp