[dev] Work on quiet mode

Made quiet mode default and added a -v (verbose) option for legacy
output
dev
Joaquin 3 years ago
parent 7c48245b6f
commit 5db12c45a6
Signed by: puly
GPG Key ID: 9E9299CD96C65EC6
  1. 36
      koffe

36
koffe

@ -9,6 +9,9 @@ quiet=0
pactree_command="pactree -su " pactree_command="pactree -su "
pacout=/dev/stdout pacout=/dev/stdout
clearcomm='clear ; outapp' clearcomm='clear ; outapp'
wgetargs="-q --show-progress"
quiet_flag="-q"
verbose_flag=""
outapp(){ outapp(){
for outapp in $prog for outapp in $prog
do do
@ -20,7 +23,7 @@ outapp(){
fi fi
done done
echo echo
echo "----------------------------" echo ">-------------------------------------------------<"
echo echo
} }
if [ $1 ]; if [ $1 ];
@ -35,6 +38,8 @@ then
echo echo
echo "Flags:" echo "Flags:"
echo echo
echo " koofe -v --> verbose output"
echo
echo " koffe --pacs=Prog1,Prog2 --> starts koffe and creates" echo " koffe --pacs=Prog1,Prog2 --> starts koffe and creates"
echo " an iso with the programs Prog1 and Prog2" echo " an iso with the programs Prog1 and Prog2"
echo " IMPORTANT: Separate the progs with commas" echo " IMPORTANT: Separate the progs with commas"
@ -86,6 +91,9 @@ then
verbose=1 verbose=1
pacout=/dev/stdout pacout=/dev/stdout
clearcomm="echo" clearcomm="echo"
wgetargs=""
quiet_flag=""
verbose_flag="-v"
fi fi
done done
@ -160,7 +168,7 @@ then
pactree -su $app > /tmp/koffe/wout_opt 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' ' ')" prog="$prog $(grep -Fxvf /tmp/koffe/wout_opt /tmp/koffe/with_opt | cut -d ':' -f 1 | cut -d '>' -f 1 | tr '\n' ' ')"
fi 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 $clearcomm
fi fi
@ -190,7 +198,7 @@ then
done done
pacman -Spdd --noconfirm - < /tmp/koffe/grtree > /tmp/koffe/grlinks 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 $clearcomm
fi fi
if [[ $PACAUR == 1 ]]; if [[ $PACAUR == 1 ]];
@ -212,7 +220,7 @@ then
then then
pactree -su $depend > /tmp/koffe/n/$depend pactree -su $depend > /tmp/koffe/n/$depend
pacman -Spdd --noconfirm - < /tmp/koffe/n/$depend > /tmp/koffe/l/$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 $clearcomm
fi fi
if [[ $aurdep_aur == "error" ]]; 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 ':') 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 for depend in $bbm
do do
pacman -S $depend --noconfirm echo "--> Install $depend (needed to build the AUR package)?"
pacman -S $depend --noconfirm > $pacout
done 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 cp /tmp/koffe/aurbg/$app/*.pkg.tar.zst /tmp/koffe/rootfs/airootfs/root/pkg
fi fi
done 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 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_workdir
rm -rf /tmp/koffe/rootfs//airootfs/root/* rm -rf /tmp/koffe/rootfs//airootfs/root/*
rm -rf /tmp/koffe/ rm -rf /tmp/koffe/
echo "Done!"
echo
echo "quit"
fi fi

Loading…
Cancel
Save