[bug fix] Fix optdeps not installed

Fixed Optional Dependencies being downloaded but not installed on the
system and also the exit menu of the install script
main
Joaquin 3 years ago
parent 317c1d943f
commit a6f026c65a
Signed by: puly
GPG Key ID: 9E9299CD96C65EC6
  1. 8
      install
  2. 17
      koffe

@ -48,11 +48,7 @@ cp pi.is /mnt/root/
echo 'bash /root/pi.is' > /mnt/root/.bashrc
echo 'echo "" > /root/.bashrc' >> /mnt/root/.bashrc
arch-chroot /mnt
whiptail --clear --backtitle "Koffe Offline Arch Installer - made by Konicks(GRI)" --title "Goodbye screen" --msgbox "Well, that was everything. Use reboot or poweroff to exit" 0 0
umount -a
if (whiptail --title "Koffe Finished" --yesno "Installation Finished, do you want to reboot?" 8 78); then
reboot
else
exit
fi
ersp=$(whiptail --title "Installation Finished" --menu "Installation Finished. Do you want to exit to terminal OR poweroff and boot into arch?" 19 74 10 "exit" "and enter a terminal" "poweroff" "and boot into arch" 3>&1 1>&2 2>&3 3>&-)
$ersp

17
koffe

@ -121,6 +121,13 @@ then
$pactree_command $app > /tmp/koffe/n/$app
pacman -Spdd --noconfirm - < /tmp/koffe/n/$app > /tmp/koffe/l/$app
echo $app >> /tmp/koffe/rootfs/airootfs/root/install.list
if [[ $optdep == 1 ]];
then
#ADD OPTIONAL DEPS TO INSTALL LIST
pactree -suo $app > /tmp/koffe/with_opt
pactree -su $app > /tmp/koffe/wout_opt
grep -Fxvf /tmp/koffe/wout_opt /tmp/koffe/with_opt >> /tmp/koffe/rootfs/airootfs/root/install.list
fi
wget -nc -i /tmp/koffe/l/$app -P /tmp/koffe/rootfs/airootfs/root/pkg/
fi
@ -140,6 +147,14 @@ then
do
$pactree_command $component >> /tmp/koffe/grtree
echo $component >> /tmp/koffe/rootfs/airootfs/root/install.list
if [[ $optdep == 1 ]];
then
#ADD OPTIONAL DEPS TO INSTALL LIST
pactree -suo $component > /tmp/koffe/with_opt
pactree -su $component > /tmp/koffe/wout_opt
grep -Fxvf /tmp/koffe/wout_opt /tmp/koffe/with_opt >> /tmp/koffe/rootfs/airootfs/root/install.list
fi
done
pacman -Spdd --noconfirm - < /tmp/koffe/grtree > /tmp/koffe/grlinks
wget -nc -i /tmp/koffe/grlinks -P /tmp/koffe/rootfs/airootfs/root/pkg/
@ -161,7 +176,7 @@ then
if [[ $aurdep_aur != "error" ]];
then
$pactree_command $depend > /tmp/koffe/n/$depend
pactree -su $depend > /tmp/koffe/n/$depend
pacman -Spdd --noconfirm - < /tmp/koffe/n/$depend > /tmp/koffe/l/$depend
wget -nc -i /tmp/koffe/l/$depend -P /tmp/koffe/rootfs/airootfs/root/pkg/
fi

Loading…
Cancel
Save