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

---
 apps/Drawing/install-32 | 3 ++-
 apps/Drawing/install-64 | 2 +-
 apps/Drawing/uninstall  | 4 +---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/Drawing/install-32 b/apps/Drawing/install-32
index eba68ba..7396dc8 100755
--- a/apps/Drawing/install-32
+++ b/apps/Drawing/install-32
@@ -17,5 +17,6 @@ fi
 rm -f ~/drawing.deb
 wget -O ~/drawing.deb "https://launchpad.net/~cartes/+archive/ubuntu/drawing/+files/drawing_0.8.3-0ubuntu1~hirsute_armhf.deb" || error "Failed to download drawing.deb"
 
-sudo apt install -yf ~/drawing.deb || error "APT failed to install drawing.deb"
+
+"${DIRECTORY}/pkg-install" "$HOME/drawing.deb" "$(dirname "$0")" || error "APT failed to install drawing.deb"
 rm -f ~/drawing.deb
diff --git a/apps/Drawing/install-64 b/apps/Drawing/install-64
index 3c47f61..08fd2ad 100755
--- a/apps/Drawing/install-64
+++ b/apps/Drawing/install-64
@@ -12,5 +12,5 @@ function error {
 rm -f ~/drawing.deb
 wget -O ~/drawing.deb "https://launchpad.net/~cartes/+archive/ubuntu/drawing/+files/drawing_0.8.3-0ubuntu1~hirsute_arm64.deb" || error "Failed to download drawing.deb"
 
-sudo apt install -yf ~/drawing.deb || error "APT failed to install drawing.deb"
+"${DIRECTORY}/pkg-install" "$HOME/drawing.deb" "$(dirname "$0")" || error "APT failed to install drawing.deb"
 rm -f ~/drawing.deb
diff --git a/apps/Drawing/uninstall b/apps/Drawing/uninstall
index c64886d..4cc004d 100755
--- a/apps/Drawing/uninstall
+++ b/apps/Drawing/uninstall
@@ -7,6 +7,4 @@ function error {
   exit 1
 }
 
-if command -v drawing >/dev/null ;then
-  sudo apt purge -y drawing || error "apt failed to uninstall the 'drawing' package."
-fi
+"${DIRECTORY}/purge-installed" "$(dirname "$0")" || exit 1 || error "apt failed to uninstall the 'drawing' package."