Refactor
This commit is contained in:
parent
d01c6c2d53
commit
62a58ef0b9
18
install.sh
18
install.sh
|
@ -209,31 +209,29 @@ installPackage() {
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
B)
|
B)
|
||||||
|
flag=""
|
||||||
if [ "$2" != "R" ]; then
|
if [ "$2" != "R" ]; then
|
||||||
runInChroot "pacman -Q ${1}" 2>&1 | debug
|
runInChroot "pacman -Q ${1}" 2>&1 | debug
|
||||||
[ $? -eq 0 ] && return
|
[ $? -eq 0 ] && return
|
||||||
needed="--needed"
|
flag="--needed"
|
||||||
else
|
|
||||||
needed=""
|
|
||||||
fi
|
fi
|
||||||
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 $flag --noconfirm ${1}\" /dev/null" 2>&1 | debug
|
||||||
else
|
else
|
||||||
runInChroot "pacman -S $needed --noconfirm ${1}" 2>&1 | debug
|
runInChroot "pacman -S $flag --noconfirm ${1}" 2>&1 | debug
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
C)
|
C)
|
||||||
|
flag=""
|
||||||
if [ "$2" != "R" ]; then
|
if [ "$2" != "R" ]; then
|
||||||
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 ] && return
|
||||||
needed="--needed"
|
flag="--needed"
|
||||||
else
|
|
||||||
needed=""
|
|
||||||
fi
|
fi
|
||||||
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 $flag --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 $flag --noconfirm --skipreview ${1}" 2>&1 | debug
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
D)
|
D)
|
||||||
|
|
Loading…
Reference in New Issue