From 3f2e545768b7e86939e7192ee99bae196bed3e78 Mon Sep 17 00:00:00 2001
From: Botspot <j.allen.marchand@outlook.com>
Date: Sat, 14 Aug 2021 23:07:53 -0500
Subject: [PATCH] Github-CLI: use pkg-install

---
 apps/Github-CLI/install-32 | 12 +++++++-----
 apps/Github-CLI/install-64 | 12 +++++++-----
 apps/Github-CLI/uninstall  |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/apps/Github-CLI/install-32 b/apps/Github-CLI/install-32
index 7dbedef..2f0ee49 100755
--- a/apps/Github-CLI/install-32
+++ b/apps/Github-CLI/install-32
@@ -10,11 +10,13 @@ function error {
 cd $HOME
 
 #remove old deb (if exists)
-rm -f gh*linux_armv6.deb
+rm -f ~/gh.deb
+
 #download
-wget -O gh.deb https://github.com/cli/cli/releases/download/v1.13.1/gh_1.13.1_linux_armv6.deb || error 'Failed to download github-cli!'
+wget -O ~/gh.deb https://github.com/cli/cli/releases/download/v1.13.1/gh_1.13.1_linux_armv6.deb || error 'Failed to download github-cli!'
+
 #install
-"${DIRECTORY}/api" apt_lock_wait
-sudo apt -fy install ./gh.deb || error "Failed to install gh!"
+"${DIRECTORY}/pkg-install" "$HOME/gh.deb" "$(dirname "$0")" || error "Failed to install turbowarp.deb!"
+
 #clean up
-rm -f gh.deb
+rm -f ~/gh.deb
diff --git a/apps/Github-CLI/install-64 b/apps/Github-CLI/install-64
index bfd63a9..f6eda8d 100755
--- a/apps/Github-CLI/install-64
+++ b/apps/Github-CLI/install-64
@@ -10,11 +10,13 @@ function error {
 cd $HOME
 
 #remove old deb (if exists)
-rm -f gh*linux_arm64.deb
+rm -f ~/gh.deb
+
 #download
-wget -O gh.deb https://github.com/cli/cli/releases/download/v1.13.1/gh_1.13.1_linux_arm64.deb || error 'Failed to download github-cli!'
+wget -O ~/gh.deb https://github.com/cli/cli/releases/download/v1.13.1/gh_1.13.1_linux_arm64.deb || error 'Failed to download github-cli!'
+
 #install
-"${DIRECTORY}/api" apt_lock_wait
-sudo apt -fy install ./gh.deb || error "Failed to install gh!"
+"${DIRECTORY}/pkg-install" "$HOME/gh.deb" "$(dirname "$0")" || error "Failed to install turbowarp.deb!"
+
 #clean up
-rm -f gh.deb
+rm -f ~/gh.deb
diff --git a/apps/Github-CLI/uninstall b/apps/Github-CLI/uninstall
index c04c809..b9730dd 100755
--- a/apps/Github-CLI/uninstall
+++ b/apps/Github-CLI/uninstall
@@ -8,4 +8,4 @@ function error {
 }
 
 #uninstall
-sudo apt -y purge gh || error "Failed to uninstall gh!"
+"${DIRECTORY}/purge-installed" "$(dirname "$0")" || error "Failed to uninstall gh!"