From 5db12c45a6a3455011765e95a9b534e4bc1f1b38 Mon Sep 17 00:00:00 2001
From: Joaquin <ioachim.radu@protonmail.com>
Date: Mon, 17 Apr 2023 14:58:07 +0300
Subject: [PATCH] [dev] Work on quiet mode

Made quiet mode default and added a -v (verbose) option for legacy
output
---
 koffe | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/koffe b/koffe
index 45528a2..e033e33 100755
--- a/koffe
+++ b/koffe
@@ -9,6 +9,9 @@ quiet=0
 pactree_command="pactree -su "
 pacout=/dev/stdout
 clearcomm='clear ; outapp'
+wgetargs="-q --show-progress"
+quiet_flag="-q"
+verbose_flag=""
 outapp(){
 	for outapp in $prog
 	do
@@ -20,7 +23,7 @@ outapp(){
 		fi
 	done
 	echo
-	echo "----------------------------"
+	echo ">-------------------------------------------------<"
 	echo
 }
 if [ $1 ]; 
@@ -35,6 +38,8 @@ then
 			echo 
             echo "Flags:"
 			echo
+			echo "	koofe -v				  --> verbose output"
+			echo
             echo "	koffe --pacs=Prog1,Prog2  --> starts koffe and creates" 
             echo "                                an iso with the programs Prog1 and Prog2"
             echo "                                IMPORTANT: Separate the progs with commas"
@@ -86,6 +91,9 @@ then
 			verbose=1
 			pacout=/dev/stdout
 			clearcomm="echo"
+			wgetargs=""
+			quiet_flag=""
+			verbose_flag="-v"
 		fi
 
     done
@@ -160,7 +168,7 @@ then
 					pactree -su $app > /tmp/koffe/wout_opt
 					prog="$prog $(grep -Fxvf /tmp/koffe/wout_opt /tmp/koffe/with_opt | cut -d ':' -f 1 | cut -d '>' -f 1 | tr '\n' ' ')"
 				fi
-            	wget -q --show-progress -nc -i /tmp/koffe/l/$app -P /tmp/koffe/rootfs/airootfs/root/pkg/
+            	wget $wgetargs -nc -i /tmp/koffe/l/$app -P /tmp/koffe/rootfs/airootfs/root/pkg/
 				$clearcomm
 			fi
 			
@@ -190,7 +198,7 @@ then
 		
             done
             pacman -Spdd --noconfirm - < /tmp/koffe/grtree > /tmp/koffe/grlinks
-            wget -q --show-progress -nc -i /tmp/koffe/grlinks -P /tmp/koffe/rootfs/airootfs/root/pkg/
+            wget $wgetargs -nc -i /tmp/koffe/grlinks -P /tmp/koffe/rootfs/airootfs/root/pkg/
 			$clearcomm
         fi
 		if [[ $PACAUR == 1 ]];
@@ -212,7 +220,7 @@ then
 				then
             	pactree -su $depend > /tmp/koffe/n/$depend
             	pacman -Spdd --noconfirm - < /tmp/koffe/n/$depend > /tmp/koffe/l/$depend
-            	wget -q --show-progress -nc -i /tmp/koffe/l/$depend -P /tmp/koffe/rootfs/airootfs/root/pkg/
+            	wget $wgetargs -nc -i /tmp/koffe/l/$depend -P /tmp/koffe/rootfs/airootfs/root/pkg/
 				$clearcomm
 				fi
 				if [[ $aurdep_aur == "error" ]];
@@ -229,17 +237,29 @@ then
         	bbm=$(cat /tmp/koffe/aurbg/$app/.SRCINFO | grep makedepends | cut -f 2 -d '=' | cut -f 1 -d '>' | cut -f 1 -d ':')
         	for depend in $bbm
         	do
-				pacman -S $depend --noconfirm
+				echo "--> Install $depend (needed to build the AUR package)?"
+				pacman -S $depend --noconfirm > $pacout
 			done
-			sudo -u nobody makepkg --noconfirm --skippgpcheck
+			sudo -u nobody makepkg --noconfirm --skippgpcheck > $pacout
         	cp /tmp/koffe/aurbg/$app/*.pkg.tar.zst /tmp/koffe/rootfs/airootfs/root/pkg
 		fi
     done
-    repo-add /tmp/koffe/rootfs/airootfs/root/pkg/koffe.db.tar.gz /tmp/koffe/rootfs/airootfs/root/pkg/*
+	clear
+	echo -e "${green}-->${reset} Building REPO image"
+    repo-add $quiet_flag /tmp/koffe/rootfs/airootfs/root/pkg/koffe.db.tar.gz /tmp/koffe/rootfs/airootfs/root/pkg/* > $pacout
+	echo "Done!"
+	echo
 	echo "bash ~/install" > /tmp/koffe/rootfs/airootfs/root/.zshrc
-    mkarchiso -v -w /tmp/koffe_workdir -o $pathto /tmp/koffe/rootfs/
+	echo -e "${green}-->${reset} Making ISO image (might take a while)"
+    mkarchiso $verbose_flag -L "koffe" -w /tmp/koffe_workdir -o $pathto /tmp/koffe/rootfs/ 2>&1 1>$pacout
+	echo "Done!"
+	echo
+	echo "--> Cleaning up"
     rm -rf /tmp/koffe_workdir
     rm -rf /tmp/koffe/rootfs//airootfs/root/*
     rm -rf /tmp/koffe/
+	echo "Done!"
+	echo
+	echo "quit"
 fi