From 59d0e0446424536ade81bfc4cc704a2b2aa24046 Mon Sep 17 00:00:00 2001
From: Botspot <j.allen.marchand@outlook.com>
Date: Wed, 11 Aug 2021 15:01:08 -0500
Subject: [PATCH] Various error-fixes to Doom 3

---
 apps/Doom 3/install-32 | 16 ++++------------
 apps/Doom 3/uninstall  |  9 +++++----
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/apps/Doom 3/install-32 b/apps/Doom 3/install-32
index c57e1a1..132c89a 100755
--- a/apps/Doom 3/install-32	
+++ b/apps/Doom 3/install-32	
@@ -7,27 +7,19 @@ function error {
   exit 1
 }
 
-#Removing Github Repo if already cloned from github
-
-sudo rm -r ~/RPIDoom3Installer 
-
-#Cloning Github Repo
-
-git clone https://github.com/techcoder20/RPIDoom3Installer.git ~/RPIDoom3Installer  || error 'Failed to clone example.com repository!'
+rm -rf ~/RPIDoom3Installer || error "Failed to first remove ~/RPIDoom3Installer folder!"
 
 # Get dependencies
-
 "${DIRECTORY}/pkg-install" "libfontconfig-dev qt5-default automake mercurial libtool libfreeimage-dev \
 libopenal-dev libpango1.0-dev libsndfile-dev libudev-dev libtiff5-dev libwebp-dev libasound2-dev \
 libaudio-dev libxrandr-dev libxcursor-dev libxi-dev libxinerama-dev libxss-dev libesd0-dev \
 freeglut3-dev libmodplug-dev libsmpeg-dev libjpeg-dev libogg-dev libvorbis-dev libvorbisfile3 libcurl4 cmake aria2 lolcat figlet" "$(dirname "$0")" || exit 1
 
-
-#Going inside the installer directory
+git clone https://github.com/techcoder20/RPIDoom3Installer || error 'Failed to clone RPIDoom3Installer repository!'
 cd ~/RPIDoom3Installer || error "Failed to change directory "
 
-#Making the install and uninstall script executable
+echo "Making scripts executable..."
 sudo chmod +x install.sh uninstall.sh || error "Failed To make install script and uninstall script executable"  
 
-#Running the install script
+echo "Running install script..."
 setarch linux32 ./install.sh || error "Failed to run install script :("
diff --git a/apps/Doom 3/uninstall b/apps/Doom 3/uninstall
index 66b4817..a1544c4 100755
--- a/apps/Doom 3/uninstall	
+++ b/apps/Doom 3/uninstall	
@@ -10,7 +10,8 @@ function error {
 #if your app installs any packages, keep this command here so those packages will be removed.
 "${DIRECTORY}/purge-installed" "$(dirname "$0")" || exit 1
 
-#Running Uninstall script
-
-cd ~/RPIDoom3Installer || "Failed to Change directory"
-./uninstall.sh || error "Failed to execute uninstall script :("
\ No newline at end of file
+if [ -d ~/RPIDoom3Installer ];then
+  cd ~/RPIDoom3Installer || "Failed to Change directory"
+  echo "Running uninstall script..."
+  ./uninstall.sh || error "Failed to execute uninstall script :("
+fi