From 56bf94731a10f434b680e4784fcd6ab25a7cd4ef Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Mon, 27 Dec 2021 12:53:47 -0300 Subject: [PATCH] Fix bugs --- install.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/install.sh b/install.sh index 4bf2c01..26fc0f4 100755 --- a/install.sh +++ b/install.sh @@ -98,10 +98,9 @@ mountPart() { } installPackage() { - # whiptail --msgbox "Installing '$1'." 0 0 case ${2} in Y) - if [ ! -z $username ]; then + if [ -z $username ]; then whiptail --msgbox "Important packages cannot be installed with paru." 0 0 logStep "${3}" exit 1 @@ -126,14 +125,14 @@ getThePackages() { fi commOutput=$(runInChroot "command -v paru &> /dev/null || echo 1") if [ "$commOutput" = "1" ] && [ "${1}" = "N" ]; then - if [ ! -z $username ]; then + if [ -z $username ]; then username=$(whiptail --inputbox "Enter the username of the newly created user." 0 0 3>&1 1>&2 2>&3) fi - # runInChroot "sed -i 's/%wheel ALL=(ALL) ALL/# %wheel ALL=(ALL) ALL/' -e '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" - runInChroot "cd /tmp; sudo -u $username git clone https://aur.archlinux.org/paru.git; cd paru; sudo -u $username makepkg -si --noconfirm; cd ..; rm -rf paru" - 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' -e 's/# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers" + # runInChroot "sed -i 's/%wheel ALL=(ALL) ALL/# %wheel ALL=(ALL) ALL/' -e '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" + runInChroot "cd /tmp; sudo -u $username git clone https://aur.archlinux.org/paru-bin.git; cd paru; sudo -u $username makepkg -si --noconfirm; cd ..; rm -rf paru" + 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/' -e 's/# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers" fi local IFS=, while read -r NAME IMPORTANT AUR; do