From d01c6c2d5339337f1e6134e8d9d57db2373510f1 Mon Sep 17 00:00:00 2001
From: Santiago Lo Coco <santilococo.01@gmail.com>
Date: Tue, 4 Jan 2022 01:09:59 -0300
Subject: [PATCH 1/2] Update installPackage()

---
 install.sh | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/install.sh b/install.sh
index 4861b2f..5ac98df 100755
--- a/install.sh
+++ b/install.sh
@@ -209,21 +209,31 @@ installPackage() {
             fi
             ;;
         B)
-            runInChroot "pacman -Q ${1}" 2>&1 | debug
-            [ $? -eq 0 ] && [ "$2" != "R" ] && return
-            if [ $debugFlagToStdout = true ] || [ $debugFlag = true ]; then
-                runInChroot "script -qec \"pacman -S --noconfirm ${1}\" /dev/null" 2>&1 | debug
+            if [ "$2" != "R" ]; then
+                runInChroot "pacman -Q ${1}" 2>&1 | debug
+                [ $? -eq 0 ] && return
+                needed="--needed"
             else
-                runInChroot "pacman -S --noconfirm ${1}" 2>&1 | debug
+                needed=""
+            fi
+            if [ $debugFlagToStdout = true ] || [ $debugFlag = true ]; then
+                runInChroot "script -qec \"pacman -S $needed --noconfirm ${1}\" /dev/null" 2>&1 | debug
+            else
+                runInChroot "pacman -S $needed --noconfirm ${1}" 2>&1 | debug
             fi
             ;;
         C)  
-            runInChroot "sudo -u $username paru -Q ${1}" 2>&1 | debug
-            [ $? -eq 0 ] && [ "$2" != "R" ] && return
-            if [ $debugFlagToStdout = true ] || [ $debugFlag = true ]; then
-                runInChroot "script -qec \"sudo -u $username paru -S --noconfirm --skipreview ${1}\" /dev/null" 2>&1 | debug
+            if [ "$2" != "R" ]; then
+                runInChroot "sudo -u $username paru -Q ${1}" 2>&1 | debug
+                [ $? -eq 0 ] && return
+                needed="--needed"
             else
-                runInChroot "sudo -u $username paru -S --noconfirm --skipreview ${1}" 2>&1 | debug
+                needed=""
+            fi
+            if [ $debugFlagToStdout = true ] || [ $debugFlag = true ]; then
+                runInChroot "script -qec \"sudo -u $username paru -S $needed --noconfirm --skipreview ${1}\" /dev/null" 2>&1 | debug
+            else
+                runInChroot "sudo -u $username paru -S $needed --noconfirm --skipreview ${1}" 2>&1 | debug
             fi
             ;;
         D)

From 62a58ef0b9b1eff54805acc8206ef6c9c74c613a Mon Sep 17 00:00:00 2001
From: Santiago Lo Coco <santilococo.01@gmail.com>
Date: Tue, 4 Jan 2022 01:47:30 -0300
Subject: [PATCH 2/2] Refactor

---
 install.sh | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/install.sh b/install.sh
index 5ac98df..121dc45 100755
--- a/install.sh
+++ b/install.sh
@@ -209,31 +209,29 @@ installPackage() {
             fi
             ;;
         B)
+            flag=""
             if [ "$2" != "R" ]; then
                 runInChroot "pacman -Q ${1}" 2>&1 | debug
                 [ $? -eq 0 ] && return
-                needed="--needed"
-            else
-                needed=""
+                flag="--needed"
             fi
             if [ $debugFlagToStdout = true ] || [ $debugFlag = true ]; then
-                runInChroot "script -qec \"pacman -S $needed --noconfirm ${1}\" /dev/null" 2>&1 | debug
+                runInChroot "script -qec \"pacman -S $flag --noconfirm ${1}\" /dev/null" 2>&1 | debug
             else
-                runInChroot "pacman -S $needed --noconfirm ${1}" 2>&1 | debug
+                runInChroot "pacman -S $flag --noconfirm ${1}" 2>&1 | debug
             fi
             ;;
         C)  
+            flag=""
             if [ "$2" != "R" ]; then
                 runInChroot "sudo -u $username paru -Q ${1}" 2>&1 | debug
                 [ $? -eq 0 ] && return
-                needed="--needed"
-            else
-                needed=""
+                flag="--needed"
             fi
             if [ $debugFlagToStdout = true ] || [ $debugFlag = true ]; then
-                runInChroot "script -qec \"sudo -u $username paru -S $needed --noconfirm --skipreview ${1}\" /dev/null" 2>&1 | debug
+                runInChroot "script -qec \"sudo -u $username paru -S $flag --noconfirm --skipreview ${1}\" /dev/null" 2>&1 | debug
             else
-                runInChroot "sudo -u $username paru -S $needed --noconfirm --skipreview ${1}" 2>&1 | debug
+                runInChroot "sudo -u $username paru -S $flag --noconfirm --skipreview ${1}" 2>&1 | debug
             fi
             ;;
         D)