diff --git a/Dockerfile b/Dockerfile index 9828e9a..e3a1dc3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,9 +19,8 @@ CMD ["bash"] FROM archlinux AS archlinux-user RUN \ - pacman -Sy curl --noconfirm && \ + pacman -Sy curl sudo --noconfirm && \ groupadd sudo && \ - mkdir /etc/sudoers.d && \ echo "%sudo ALL=(ALL:ALL) ALL" > /etc/sudoers.d/sudoers && \ useradd -m tester && \ echo tester:tester | chpasswd && \ diff --git a/tforgione.sh b/tforgione.sh index 2195a2a..fef1c3b 100755 --- a/tforgione.sh +++ b/tforgione.sh @@ -237,12 +237,13 @@ run() { packages+=(python3) packages+=(python-is-python3) packages+=(python3-pip) - elif [ $has_pacman ]; then + elif [ $has_pacman -eq 1 ]; then packages+=(python) + fi fi - if [ $should_instlal_hyprland -eq 1 ]; then + if [ $should_install_hyprland -eq 1 ]; then packages+=(hyprland) packages+=(hyprpaper) packages+=(hyprpicker)