From b2545ec3972c44916622d1c3e53dd30571cdaea5 Mon Sep 17 00:00:00 2001
From: Botspot <j.allen.marchand@outlook.com>
Date: Mon, 30 Aug 2021 12:17:40 -0500
Subject: [PATCH] Remarkable: install-32: use pkg-install

---
 apps/Remarkable/install-32 |  7 ++++---
 apps/Remarkable/uninstall  | 15 +--------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/apps/Remarkable/install-32 b/apps/Remarkable/install-32
index 38300ce..1bd55b6 100755
--- a/apps/Remarkable/install-32
+++ b/apps/Remarkable/install-32
@@ -7,7 +7,8 @@ function error {
   exit 1
 }
 
-wget https://remarkableapp.github.io/files/remarkable_1.87_all.deb || error 'Failed to Download!'
+rm -f ~/remarkable.deb
+wget -O ~/remarkable.deb https://remarkableapp.github.io/files/remarkable_1.87_all.deb || error 'Failed to download remarkable.deb!'
 
-sudo apt --fix-broken -y install ./remarkable_1.87_all.deb || error 'Failed to install!'
-rm remarkable_1.87_all.deb
+"${DIRECTORY}/pkg-install" "$HOME/remarkable.deb" "$(dirname "$0")" || error "Failed to install ~/remarkable.deb!"
+rm -f ~/remarkable.deb
diff --git a/apps/Remarkable/uninstall b/apps/Remarkable/uninstall
index 485ca2f..46bc224 100755
--- a/apps/Remarkable/uninstall
+++ b/apps/Remarkable/uninstall
@@ -7,17 +7,4 @@ function error {
   exit 1
 }
 
-#to set $arch variable
-source "${DIRECTORY}/api" || error "failed to source ${DIRECTORY}/api"
-if [ "$arch" == 64 ];then
-  #COMMANDS TO UNINSTALL 64BIT
-  "${DIRECTORY}/purge-installed" "$(dirname "$0")" || exit 1
-  
-elif [ "$arch" == 32 ];then
-  #COMMANDS TO UNINSTALL 32BIT
-  sudo apt purge remarkable -y || error "Failed to purge remarkable package!"
-  sudo apt autoremove -y
-  
-else
-  error "Failed to detect OS CPU architecture! Something is very wrong."
-fi
+"${DIRECTORY}/purge-installed" "$(dirname "$0")" || exit 1