Use new tag in installPackage()
This commit is contained in:
parent
91601cdaa0
commit
466b9d5d1f
26
install.sh
26
install.sh
|
@ -117,19 +117,21 @@ debug() {
|
||||||
installPackage() {
|
installPackage() {
|
||||||
calcWidthAndRun "whiptail --infobox \"Installing '$1'.\" 7 WIDTH"
|
calcWidthAndRun "whiptail --infobox \"Installing '$1'.\" 7 WIDTH"
|
||||||
case ${2} in
|
case ${2} in
|
||||||
Y)
|
A)
|
||||||
if [ -z $username ]; then
|
|
||||||
whiptail --msgbox "Important packages cannot be installed with paru." 0 0
|
|
||||||
logStep "${3}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
runInChroot "sudo -u $username paru -S --needed --noconfirm --skipreview ${1}" 2>&1 | debug
|
|
||||||
;;
|
|
||||||
N)
|
|
||||||
pacstrap /mnt --needed ${1} 2>&1 | debug
|
pacstrap /mnt --needed ${1} 2>&1 | debug
|
||||||
;;
|
;;
|
||||||
|
B)
|
||||||
|
runInChroot "pacman -Q ${1}" 2>&1 | debug
|
||||||
|
[ $? -eq 0 ] && return
|
||||||
|
runInChroot "pacman -S --needed --noconfirm ${1}" 2>&1 | debug
|
||||||
|
;;
|
||||||
|
C)
|
||||||
|
runInChroot "sudo -u $username paru -Q ${1}" 2>&1 | debug
|
||||||
|
[ $? -eq 0 ] && return
|
||||||
|
runInChroot "sudo -u $username paru -S --needed --noconfirm --skipreview ${1}" 2>&1 | debug
|
||||||
|
;;
|
||||||
?)
|
?)
|
||||||
whiptail --msgbox "AUR must be Y or N in packages.csv file." 0 0
|
whiptail --msgbox "INSTALL must be A, B or C in packages.csv file." 0 0
|
||||||
logStep "${3}"
|
logStep "${3}"
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
|
@ -151,9 +153,9 @@ getThePackages() {
|
||||||
curl -LO "https://raw.githubusercontent.com/santilococo/CocoASAIS/master/packages.csv" > /dev/null 2>&1
|
curl -LO "https://raw.githubusercontent.com/santilococo/CocoASAIS/master/packages.csv" > /dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
local IFS=,
|
local IFS=,
|
||||||
while read -r NAME IMPORTANT AUR; do
|
while read -r NAME IMPORTANT INSTALL; do
|
||||||
if [ "$IMPORTANT" = "${1}" ]; then
|
if [ "$IMPORTANT" = "${1}" ]; then
|
||||||
installPackage "$NAME" "$AUR" "${2}"
|
installPackage "$NAME" "$INSTALL" "${2}"
|
||||||
fi
|
fi
|
||||||
done < packages.csv
|
done < packages.csv
|
||||||
set +o pipefail
|
set +o pipefail
|
||||||
|
|
Loading…
Reference in New Issue