Don't duplicate cache clearer

1 files changed, 14 insertions, 37 deletions

diff --git a/haur b/haur
index 7982b34969f1..96c1564dc702 100755
--- a/haur
+++ b/haur
@@ -109,20 +109,8 @@ if [[ $REMOVE == true ]]; then
   for PACKAGE_NAME in "$@"; do
     echo "${blue}Removing $PACKAGE_NAME...${normal}"
     sudo pacman -Rns "$PACKAGE_NAME"
-    echo "$PACKAGE_NAME" > ~/.haur_cache
+    echo "$PACKAGE_NAME" >> ~/.haur_cache
   done
-  if [[ $CLEAR_CACHE == true ]]; then
-    if test -f "$HOME/.haur_cache"; then
-      echo "${blue}Clearing cache...${normal}"
-      while IFS= read -r line || [[ -n "$line" ]]; do
-        echo "${blue}Removing $line${normal}"
-        rm -rf "$HOME"/.haur/"$line"
-      done < "$HOME/.haur_cache"
-      rm ~/.haur_cache
-    else
-      echo "${blue}Nothing to clear${normal}"
-    fi
-  fi
 elif [[ $UPDATE == true ]]; then
   for PACKAGE_NAME in "$@"; do
     echo "${blue}Updating $PACKAGE_NAME...${normal}"
@@ -133,31 +121,7 @@ elif [[ $UPDATE == true ]]; then
     rm -f ./*.pkg.tar.gz
     makepkg -si
   done
-  if [[ $CLEAR_CACHE == true ]]; then
-    if test -f "$HOME/.haur_cache"; then
-      echo "${blue}Clearing cache...${normal}"
-      while IFS= read -r line || [[ -n "$line" ]]; do
-        echo "${blue}Removing $line${normal}"
-        rm -rf "$HOME/.haur/$line"
-      done < "$HOME/.haur_cache"
-      rm ~/.haur_cache
-    else
-      echo "${blue}Nothing to clear${normal}"
-    fi
-  fi
 else
-  if [[ $CLEAR_CACHE == true ]]; then
-    if test -f "$HOME/.haur_cache"; then
-      echo "${blue}Clearing cache...${normal}"
-      while IFS= read -r line || [[ -n "$line" ]]; do
-        echo "${blue}Removing $line${normal}"
-        rm -rf "$HOME/.haur/$line"
-      done < "$HOME/.haur_cache"
-      rm ~/.haur_cache
-    else
-      echo "${blue}Nothing to clear${normal}"
-    fi
-  fi
   for PACKAGE_NAME in "$@"; do
     echo "${blue}Installing $PACKAGE_NAME...${normal}"
     mkdir -p ~/.haur
@@ -167,3 +131,16 @@ else
     makepkg -si
   done
 fi
+
+if [[ $CLEAR_CACHE == true ]]; then
+  if test -f "$HOME/.haur_cache"; then
+    echo "${blue}Clearing cache...${normal}"
+    while IFS= read -r line || [[ -n "$line" ]]; do
+      echo "${blue}Removing $line${normal}"
+      rm -rf "$HOME/.haur/$line"
+    done < "$HOME/.haur_cache"
+    rm ~/.haur_cache
+  else
+    echo "${blue}Nothing to clear${normal}"
+  fi
+fi
\ No newline at end of file