From 7c195eefb9ee262f880bc628d9b7ab0b5903800a Mon Sep 17 00:00:00 2001
From: Santiago Lo Coco <santilococo.01@gmail.com>
Date: Mon, 27 Dec 2021 15:30:41 -0300
Subject: [PATCH] Add more redirects and update packages.csv

---
 install.sh   | 7 ++++---
 packages.csv | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/install.sh b/install.sh
index 1bf0f4c..8eb6dba 100755
--- a/install.sh
+++ b/install.sh
@@ -116,7 +116,7 @@ installPackage() {
             exit 1
             ;;
     esac
-    exitIfCancel "You must have an active internet connection" "${3}"
+    exitIfCancel "Package installation failed." "${3}"
 }
 
 checkForParu() {
@@ -129,7 +129,6 @@ checkForParu() {
 }
 
 getThePackages() {
-    checkForParu
     if [ ! -f "packages.csv" ]; then
         curl -LO "https://raw.githubusercontent.com/santilococo/CocoASAIS/master/packages.csv" > /dev/null 2>&1
     fi
@@ -144,7 +143,7 @@ getThePackages() {
 installImportantPackages() {
     whiptail --msgbox "We will start by installing some important packages in the background. Please wait." 0 0
     getThePackages "Y" "installImportantPackages"
-    runInChroot "systemctl enable NetworkManager; systemctl enable fstrim.timer"
+    runInChroot "systemctl enable NetworkManager > /dev/null 2>&1; systemctl enable fstrim.timer > /dev/null 2>&1"
 }
 
 generateFstab() {
@@ -239,6 +238,7 @@ EOF
 
 installNotImportantPackages() {
     whiptail --msgbox "Now, we will install some more packages (in the background). This may take long, please wait." 0 0
+    checkForParu
     getThePackages "N" "installNotImportantPackages"
 }
 
@@ -286,6 +286,7 @@ steps=(
 )
 
 runScript() {
+    clear
     if [ -d "$HOME/Documents" ]; then
         getDotfiles
         whiptail --title "CocoASAIS" --msgbox "All done!" 0 0
diff --git a/packages.csv b/packages.csv
index 7077101..8138099 100644
--- a/packages.csv
+++ b/packages.csv
@@ -15,7 +15,7 @@ cmake,N,N
 cppcheck,N,N
 cronie,N,N
 detox,N,N
-dialog,Y,N
+dialog,N,N
 discord,N,N
 docker,N,N
 docker-compose,N,N
@@ -63,8 +63,8 @@ networkmanager,Y,N
 nitrogen,N,N
 nmap,N,N
 noisetorch,N,Y
-noto-fonts,Y,N
-noto-fonts-emoji,Y,N
+noto-fonts,N,N
+noto-fonts-emoji,N,N
 ntfs-3g,N,N
 nvidia,Y,N
 nvidia-settings,Y,N
@@ -112,7 +112,7 @@ tk,N,N
 tmux,N,N
 traceroute,N,N
 trash-cli,N,N
-ttf-fira-code,Y,N
+ttf-fira-code,N,N
 ttf-joypixels,N,N
 ttf-meslo-nerd-font-powerlevel10k,N,Y
 unclutter,N,N