Remove --needed flag due to R tag in INSTALLER (reinstall)
This commit is contained in:
parent
85dab874b9
commit
d254074e7a
23
install.sh
23
install.sh
|
@ -200,7 +200,7 @@ debug() {
|
||||||
|
|
||||||
installPackage() {
|
installPackage() {
|
||||||
calcWidthAndRun "whiptail --infobox \"Installing '$1'.\" 7 WIDTH"
|
calcWidthAndRun "whiptail --infobox \"Installing '$1'.\" 7 WIDTH"
|
||||||
case ${2} in
|
case ${3} in
|
||||||
A)
|
A)
|
||||||
if [ $debugFlagToStdout = true ] || [ $debugFlag = true ]; then
|
if [ $debugFlagToStdout = true ] || [ $debugFlag = true ]; then
|
||||||
script -qec "pacstrap /mnt --needed ${1}" /dev/null 2>&1 | debug
|
script -qec "pacstrap /mnt --needed ${1}" /dev/null 2>&1 | debug
|
||||||
|
@ -210,20 +210,20 @@ installPackage() {
|
||||||
;;
|
;;
|
||||||
B)
|
B)
|
||||||
runInChroot "pacman -Q ${1}" 2>&1 | debug
|
runInChroot "pacman -Q ${1}" 2>&1 | debug
|
||||||
[ $? -eq 0 ] && return
|
[ $? -eq 0 ] && [ "$4" != "R" ] && return
|
||||||
if [ $debugFlagToStdout = true ] || [ $debugFlag = true ]; then
|
if [ $debugFlagToStdout = true ] || [ $debugFlag = true ]; then
|
||||||
runInChroot "script -qec \"pacman -S --needed --noconfirm ${1}\" /dev/null" 2>&1 | debug
|
runInChroot "script -qec \"pacman -S --noconfirm ${1}\" /dev/null" 2>&1 | debug
|
||||||
else
|
else
|
||||||
runInChroot "pacman -S --needed --noconfirm ${1}" 2>&1 | debug
|
runInChroot "pacman -S --noconfirm ${1}" 2>&1 | debug
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
C)
|
C)
|
||||||
runInChroot "sudo -u $username paru -Q ${1}" 2>&1 | debug
|
runInChroot "sudo -u $username paru -Q ${1}" 2>&1 | debug
|
||||||
[ $? -eq 0 ] && return
|
[ $? -eq 0 ] && [ "$4" != "R" ] && return
|
||||||
if [ $debugFlagToStdout = true ] || [ $debugFlag = true ]; then
|
if [ $debugFlagToStdout = true ] || [ $debugFlag = true ]; then
|
||||||
runInChroot "script -qec \"sudo -u $username paru -S --needed --noconfirm --skipreview ${1}\" /dev/null" 2>&1 | debug
|
runInChroot "script -qec \"sudo -u $username paru -S --noconfirm --skipreview ${1}\" /dev/null" 2>&1 | debug
|
||||||
else
|
else
|
||||||
runInChroot "sudo -u $username paru -S --needed --noconfirm --skipreview ${1}" 2>&1 | debug
|
runInChroot "sudo -u $username paru -S --noconfirm --skipreview ${1}" 2>&1 | debug
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
D)
|
D)
|
||||||
|
@ -233,10 +233,10 @@ installPackage() {
|
||||||
runInChroot "cd /tmp; sudo -u $username git clone https://github.com/${1}; cd ${pkgName}; sudo -u $username makepkg -si --noconfirm; cd ..; rm -rf ${pkgName}" 2>&1 | debug
|
runInChroot "cd /tmp; sudo -u $username git clone https://github.com/${1}; cd ${pkgName}; sudo -u $username makepkg -si --noconfirm; cd ..; rm -rf ${pkgName}" 2>&1 | debug
|
||||||
;;
|
;;
|
||||||
?)
|
?)
|
||||||
logAndExit "INSTALL must be A, B, C or D in packages.csv file." "${3}"
|
logAndExit "INSTALL must be A, B, C or D in packages.csv file." "${4}"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
exitIfCancel "Package installation failed." "${3}"
|
exitIfCancel "Package installation failed." "${4}"
|
||||||
}
|
}
|
||||||
|
|
||||||
checkForParu() {
|
checkForParu() {
|
||||||
|
@ -253,9 +253,9 @@ getThePackages() {
|
||||||
curl -LO "https://raw.githubusercontent.com/santilococo/CocoASAIS/master/packages.csv" 2>&1 | debug
|
curl -LO "https://raw.githubusercontent.com/santilococo/CocoASAIS/master/packages.csv" 2>&1 | debug
|
||||||
fi
|
fi
|
||||||
local IFS=,
|
local IFS=,
|
||||||
while read -r NAME IMPORTANT INSTALL; do
|
while read -r NAME IMPORTANT INSTALLER; do
|
||||||
if [ "$IMPORTANT" = "${1}" ]; then
|
if [ "$IMPORTANT" = "${1}" ]; then
|
||||||
installPackage "$NAME" "$INSTALL" "${2}" < /dev/null
|
installPackage "$NAME" "$IMPORTANT" "$INSTALLER" "${2}" < /dev/null
|
||||||
fi
|
fi
|
||||||
done < packages.csv
|
done < packages.csv
|
||||||
set +o pipefail
|
set +o pipefail
|
||||||
|
@ -402,6 +402,7 @@ installOtherPackages() {
|
||||||
getThePackages "S" "installOtherPackages"
|
getThePackages "S" "installOtherPackages"
|
||||||
checkForParu
|
checkForParu
|
||||||
getThePackages "N" "installOtherPackages"
|
getThePackages "N" "installOtherPackages"
|
||||||
|
getThePackages "R" "installOtherPackages"
|
||||||
runInChroot "sed -i 's/^%wheel ALL=(ALL) NOPASSWD: ALL/# %wheel ALL=(ALL) NOPASSWD: ALL/' /etc/sudoers"
|
runInChroot "sed -i 's/^%wheel ALL=(ALL) NOPASSWD: ALL/# %wheel ALL=(ALL) NOPASSWD: ALL/' /etc/sudoers"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -129,7 +129,7 @@ noisetorch,N,C
|
||||||
nvimpager-git,N,C
|
nvimpager-git,N,C
|
||||||
orchis-theme-bin,N,C
|
orchis-theme-bin,N,C
|
||||||
pam-gnupg,N,C
|
pam-gnupg,N,C
|
||||||
pambase,N,B
|
pambase,R,B
|
||||||
pandoc-bin,N,C
|
pandoc-bin,N,C
|
||||||
pdfjumbler,N,C
|
pdfjumbler,N,C
|
||||||
picom-git,N,C
|
picom-git,N,C
|
||||||
|
|
|
Loading…
Reference in New Issue