From 1c5625fc4539aa8dfa5e1b430d9b38dbe7bdc5d8 Mon Sep 17 00:00:00 2001
From: Botspot <j.allen.marchand@outlook.com>
Date: Mon, 23 Aug 2021 08:09:47 -0500
Subject: [PATCH] Browsh: use pkg-install

---
 apps/Browsh/install-32 | 11 +++++------
 apps/Browsh/install-64 | 12 +++++-------
 apps/Browsh/uninstall  |  7 +------
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/apps/Browsh/install-32 b/apps/Browsh/install-32
index 6335a83..b2afc27 100755
--- a/apps/Browsh/install-32
+++ b/apps/Browsh/install-32
@@ -7,12 +7,12 @@ function error {
   exit 1
 }
 
-# Get dependencies
-"${DIRECTORY}/pkg-install" "firefox-esr" "$(dirname "$0")" || exit 1
+rm -f ~/browsh.deb
+wget -O browsh.deb https://github.com/browsh-org/browsh/releases/download/v1.6.4/browsh_1.6.4_linux_armv7.deb || error 'Failed to download browsh!'
+
+"${DIRECTORY}/pkg-install" "firefox-esr $HOME/browsh.deb" "$(dirname "$0")" || error 'Failed to install browsh.deb!'
+rm -f ~/browsh.deb
 
-wget https://github.com/browsh-org/browsh/releases/download/v1.6.4/browsh_1.6.4_linux_armv7.deb || error 'Failed to download browsh!'
-sudo apt -yf install ./browsh_1.6.4_linux_armv7.deb || error 'Failed to install browsh!' 
-rm browsh_1.6.4_linux_armv7.deb 
 echo "[Desktop Entry]
 Version=1.1
 Type=Application
@@ -22,4 +22,3 @@ Icon=$(dirname "$0")/icon-64.png
 Exec=browsh
 Terminal=true
 Categories=Network;" > ~/.local/share/applications/browsh.desktop
-
diff --git a/apps/Browsh/install-64 b/apps/Browsh/install-64
index a95ef68..7d658cf 100755
--- a/apps/Browsh/install-64
+++ b/apps/Browsh/install-64
@@ -7,12 +7,12 @@ function error {
   exit 1
 }
 
-# Get dependencies
-"${DIRECTORY}/pkg-install" "firefox-esr" "$(dirname "$0")" || exit 1
+rm -f ~/browsh.deb
+wget -O browsh.deb https://github.com/browsh-org/browsh/releases/download/v1.6.4/browsh_1.6.4_linux_arm64.deb || error 'Failed to download browsh!'
+
+"${DIRECTORY}/pkg-install" "firefox-esr $HOME/browsh.deb" "$(dirname "$0")" || error 'Failed to install browsh.deb!'
+rm -f ~/browsh.deb
 
-wget https://github.com/browsh-org/browsh/releases/download/v1.6.4/browsh_1.6.4_linux_arm64.deb || error 'Failed to download browsh!'
-sudo apt -yf install ./browsh_1.6.4_linux_arm64.deb || error 'Failed to install browsh!' 
-rm browsh_1.6.4_linux_arm64.deb
 echo "[Desktop Entry]
 Version=1.1
 Type=Application
@@ -21,6 +21,4 @@ Comment=The modern text-based terminal browser.
 Icon=$(dirname "$0")/icon-64.png
 Exec=browsh
 Terminal=true
-Actions=
 Categories=Network;" > ~/.local/share/applications/browsh.desktop
-
diff --git a/apps/Browsh/uninstall b/apps/Browsh/uninstall
index b8f72bd..dd2041a 100755
--- a/apps/Browsh/uninstall
+++ b/apps/Browsh/uninstall
@@ -7,11 +7,6 @@ function error {
   exit 1
 }
 
-if command -v browsh >/dev/null ;then
-  sudo apt purge -y browsh || error 'Failed to remove browsh!'
-fi
+"${DIRECTORY}/purge-installed" "$(dirname "$0")" || error 'Failed to purge browsh package!'
 
 sudo rm -f ~/.local/share/applications/browsh.desktop
-
-#if your app installs any packages, keep this command here so those packages will be removed.
-"${DIRECTORY}/purge-installed" "$(dirname "$0")" || exit 1