From f3dd93695f416a9fd3a20661b267e70132085d29 Mon Sep 17 00:00:00 2001
From: Botspot <j.allen.marchand@outlook.com>
Date: Sun, 15 Aug 2021 15:30:15 -0500
Subject: [PATCH] All Is Well: remove folder before clone and use rm -f

---
 apps/All Is Well/install   | 5 +++--
 apps/All Is Well/uninstall | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/All Is Well/install b/apps/All Is Well/install
index 6b025e2..a718044 100755
--- a/apps/All Is Well/install	
+++ b/apps/All Is Well/install	
@@ -7,6 +7,7 @@ function error {
   exit 1
 }
 
+rm -rf ~/All-is-well || error "Failed to first remove ~/All-is-well folder!"
 git clone https://github.com/spectrumgamer75/All-is-well || error "Failed to download!"
 cd $HOME/All-is-well/aiw
 chmod +x 'aiwrpi.sh'
@@ -14,9 +15,9 @@ echo "alias aiw=$HOME/All-is-well/aiw/aiwrpi.sh" >> ~/.bashrc
 echo "[Desktop Entry]
 Name=All Is Well
 GenericName=Update Helper and Fixer
-Comment= ALL IS WELL is a bash script that allows users to easily update and upgrade their repositories and packages on linux. It will also fix any broken packages and dependencies.
+Comment=ALL IS WELL is a bash script that allows users to easily update and upgrade their repositories and packages on linux. It will also fix any broken packages and dependencies.
 Exec=$DIRECTORY/etc/terminal-run $HOME/All-is-well/aiw/aiwrpi.sh 'All Is Well'
-Icon=$HOME/pi-apps/apps/All Is Well/icon-64.png
+Icon=$(dirname "$0")/icon-64.png
 Terminal=false
 StartupNotify=true
 Type=Application
diff --git a/apps/All Is Well/uninstall b/apps/All Is Well/uninstall
index f7fa830..c22dd85 100755
--- a/apps/All Is Well/uninstall	
+++ b/apps/All Is Well/uninstall	
@@ -1,9 +1,9 @@
 #! /bin/bash
 # This is the uninstall script for the All Is Well script
 # Removes shortcuts
-rm ~/.local/share/applications/aiw.desktop
+rm -f ~/.local/share/applications/aiw.desktop
 # Removes main folder
-sudo rm -r ~/All-is-well
+sudo rm -rf ~/All-is-well
 # Removes alias
 sed -i '/alias aiw=.*All-is-well.*/d' ~/.bashrc
 exit 0