From fcd6dd50642a5ef5b36e6745b74a59b37b432edb Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Fri, 1 Jul 2022 11:17:14 -0400 Subject: [PATCH] use whiptail instead of dialog --- larbs.sh | 138 ++++++++++++++++++++++++------------------------------- 1 file changed, 60 insertions(+), 78 deletions(-) diff --git a/larbs.sh b/larbs.sh index 46695fc..c6f714c 100755 --- a/larbs.sh +++ b/larbs.sh @@ -24,48 +24,50 @@ error() { } welcomemsg() { - dialog --title "Welcome!" \ + whiptail --title "Welcome!" \ --msgbox "Welcome to Luke's Auto-Rice Bootstrapping Script!\\n\\nThis script will automatically install a fully-featured Linux desktop, which I use as my main machine.\\n\\n-Luke" 10 60 - dialog --colors --title "Important Note!" --yes-label "All ready!" \ - --no-label "Return..." \ + whiptail --title "Important Note!" --yes-button "All ready!" \ + --no-button "Return..." \ --yesno "Be sure the computer you are using has current pacman updates and refreshed Arch keyrings.\\n\\nIf it does not, the installation of some programs might fail." 8 70 } getuserandpass() { # Prompts user for new username an password. - name=$(dialog --inputbox "First, please enter a name for the user account." 10 60 3>&1 1>&2 2>&3 3>&1) || exit 1 + name=$(whiptail --inputbox "First, please enter a name for the user account." 10 60 3>&1 1>&2 2>&3 3>&1) || exit 1 while ! echo "$name" | grep -q "^[a-z_][a-z0-9_-]*$"; do - name=$(dialog --no-cancel --inputbox "Username not valid. Give a username beginning with a letter, with only lowercase letters, - or _." 10 60 3>&1 1>&2 2>&3 3>&1) + name=$(whiptail --nocancel --inputbox "Username not valid. Give a username beginning with a letter, with only lowercase letters, - or _." 10 60 3>&1 1>&2 2>&3 3>&1) done - pass1=$(dialog --no-cancel --passwordbox "Enter a password for that user." 10 60 3>&1 1>&2 2>&3 3>&1) - pass2=$(dialog --no-cancel --passwordbox "Retype password." 10 60 3>&1 1>&2 2>&3 3>&1) + pass1=$(whiptail --nocancel --passwordbox "Enter a password for that user." 10 60 3>&1 1>&2 2>&3 3>&1) + pass2=$(whiptail --nocancel --passwordbox "Retype password." 10 60 3>&1 1>&2 2>&3 3>&1) while ! [ "$pass1" = "$pass2" ]; do unset pass2 - pass1=$(dialog --no-cancel --passwordbox "Passwords do not match.\\n\\nEnter password again." 10 60 3>&1 1>&2 2>&3 3>&1) - pass2=$(dialog --no-cancel --passwordbox "Retype password." 10 60 3>&1 1>&2 2>&3 3>&1) + pass1=$(whiptail --nocancel --passwordbox "Passwords do not match.\\n\\nEnter password again." 10 60 3>&1 1>&2 2>&3 3>&1) + pass2=$(whiptail --nocancel --passwordbox "Retype password." 10 60 3>&1 1>&2 2>&3 3>&1) done } usercheck() { ! { id -u "$name" >/dev/null 2>&1; } || - dialog --colors --title "WARNING!" --yes-label "CONTINUE" \ - --no-label "No wait..." \ - --yesno "The user \`$name\` already exists on this system. LARBS can install for a user already existing, but it will \\Zboverwrite\\Zn any conflicting settings/dotfiles on the user account.\\n\\nLARBS will \\Zbnot\\Zn overwrite your user files, documents, videos, etc., so don't worry about that, but only click if you don't mind your settings being overwritten.\\n\\nNote also that LARBS will change $name's password to the one you just gave." 14 70 + whiptail --title "WARNING" --yes-button "CONTINUE" \ + --no-button "No wait..." \ + --yesno "The user \`$name\` already exists on this system. LARBS can install for a user already existing, but it will OVERWRITE any conflicting settings/dotfiles on the user account.\\n\\nLARBS will NOT overwrite your user files, documents, videos, etc., so don't worry about that, but only click if you don't mind your settings being overwritten.\\n\\nNote also that LARBS will change $name's password to the one you just gave." 14 70 } preinstallmsg() { - dialog --title "Let's get this party started!" --yes-label "Let's go!" \ - --no-label "No, nevermind!" \ + whiptail --title "Let's get this party started!" --yes-button "Let's go!" \ + --no-button "No, nevermind!" \ --yesno "The rest of the installation will now be totally automated, so you can sit back and relax.\\n\\nIt will take some time, but when done, you can relax even more with your complete system.\\n\\nNow just press and the system will begin installation!" 13 60 || { clear; exit 1; } } adduserandpass() { # Adds user `$name` with password $pass1. - dialog --infobox "Adding user \"$name\"..." 4 50 + whiptail --msgbox "Adding user \"$name\"..." 7 50 useradd -m -g wheel -s /bin/zsh "$name" >/dev/null 2>&1 \ || usermod -a -G wheel "$name" && mkdir -p /home/"$name" && chown "$name":wheel /home/"$name" - export repodir="/home/$name/.local/src"; mkdir -p "$repodir"; chown -R "$name":wheel "$(dirname "$repodir")" + export repodir="/home/$name/.local/src" + mkdir -p "$repodir" + chown -R "$name":wheel "$(dirname "$repodir")" echo "$name:$pass1" | chpasswd unset pass1 pass2 } @@ -73,11 +75,11 @@ adduserandpass() { refreshkeys() { case "$(readlink -f /sbin/init)" in *systemd* ) - dialog --infobox "Refreshing Arch Keyring..." 4 40 + whiptail --msgbox "Refreshing Arch Keyring..." 7 40 pacman --noconfirm -S archlinux-keyring polkit >/dev/null 2>&1 ;; *) - dialog --infobox "Enabling Arch Repositories..." 4 40 + whiptail --msgbox "Enabling Arch Repositories..." 7 40 if ! grep -q "^\[universe\]" /etc/pacman.conf; then echo "[universe] Server = https://universe.artixlinux.org/\$arch @@ -101,20 +103,14 @@ Include = /etc/pacman.d/mirrorlist-arch" >> /etc/pacman.conf esac } -newperms() { - # Set special sudoers settings for install (or after). - sed -i "/#LARBS/d" /etc/sudoers - echo "$* #LARBS" >> /etc/sudoers -} - manualinstall() { # Installs $1 manually. Used only for AUR helper here. # Should be run after repodir is created and var is set. - dialog --infobox "Installing \"$1\", an AUR helper..." 4 50 + whiptail --msgbox "Installing \"$1\", an AUR helper..." 7 50 sudo -u "$name" mkdir -p "$repodir/$1" sudo -u "$name" git -C "$repodir/$1" clone --depth 1 --single-branch \ - --no-tags -q "https://aur.archlinux.org/$1.git" "$repodir/$1" \ - || { cd "$repodir/$1" || return 1 ; sudo -u "$name" git pull --force origin master ;} + --no-tags -q "https://aur.archlinux.org/$1.git" "$repodir/$1" || + { cd "$repodir/$1" || return 1 ; sudo -u "$name" git pull --force origin master ;} cd "$repodir/$1" || exit 1 sudo -u "$name" -D "$repodir/$1" \ makepkg --noconfirm -si >/dev/null 2>&1 || return 1 @@ -122,18 +118,18 @@ manualinstall() { maininstall() { # Installs all needed programs from main repo. - dialog --title "LARBS Installation" --infobox "Installing \`$1\` ($n of $total). $1 $2" 5 70 + whiptail --title "LARBS Installation" --msgbox "Installing \`$1\` ($n of $total). $1 $2" 9 70 installpkg "$1" } gitmakeinstall() { progname="$(basename "$1" .git)" dir="$repodir/$progname" - dialog --title "LARBS Installation" \ - --infobox "Installing \`$progname\` ($n of $total) via \`git\` and \`make\`. $(basename "$1") $2" 5 70 - sudo -u "$name" git clone -C "$repodir/$1" \ - --depth 1 --single-branch --no-tags -q "$1" "$dir" \ - || { cd "$dir" || return 1 ; sudo -u "$name" git pull --force origin master ;} + whiptail --title "LARBS Installation" \ + --msgbox "Installing \`$progname\` ($n of $total) via \`git\` and \`make\`. $(basename "$1") $2" 8 70 + sudo -u "$name" git -C "$repodir/$1" clone --depth 1 --single-branch \ + --no-tags -q "$1" "$dir" || + { cd "$dir" || return 1 ; sudo -u "$name" git pull --force origin master ;} cd "$dir" || exit 1 make >/dev/null 2>&1 make install >/dev/null 2>&1 @@ -141,15 +137,15 @@ gitmakeinstall() { } aurinstall() { - dialog --title "LARBS Installation" \ - --infobox "Installing \`$1\` ($n of $total) from the AUR. $1 $2" 5 70 + whiptail --title "LARBS Installation" \ + --msgbox "Installing \`$1\` ($n of $total) from the AUR. $1 $2" 5 70 echo "$aurinstalled" | grep -q "^$1$" && return 1 sudo -u "$name" $aurhelper -S --noconfirm "$1" >/dev/null 2>&1 } pipinstall() { - dialog --title "LARBS Installation" \ - --infobox "Installing the Python package \`$1\` ($n of $total). $1 $2" 5 70 + whiptail --title "LARBS Installation" \ + --msgbox "Installing the Python package \`$1\` ($n of $total). $1 $2" 5 70 [ -x "$(command -v "pip")" ] || installpkg python-pip >/dev/null 2>&1 yes | pip install "$1" } @@ -174,7 +170,7 @@ installationloop() { putgitrepo() { # Downloads a gitrepo $1 and places the files in $2 only overwriting conflicts - dialog --infobox "Downloading and installing config files..." 4 60 + whiptail --msgbox "Downloading and installing config files..." 7 60 [ -z "$3" ] && branch="master" || branch="$repobranch" dir=$(mktemp -d) [ ! -d "$2" ] && mkdir -p "$2" @@ -185,25 +181,18 @@ putgitrepo() { sudo -u "$name" cp -rfT "$dir" "$2" } -systembeepoff() { - dialog --infobox "Getting rid of that retarded error beep sound..." 10 50 - rmmod pcspkr - echo "blacklist pcspkr" > /etc/modprobe.d/nobeep.conf -} - finalize(){ - dialog --infobox "Preparing welcome message..." 4 50 - dialog --title "All done!" \ - --msgbox "Congrats! Provided there were no hidden errors, the script completed successfully and all the programs and configuration files should be in place.\\n\\nTo run the new graphical environment, log out and log back in as your new user, then run the command \"startx\" to start the graphical environment (it will start automatically in tty1).\\n\\n.t Luke" 12 80 + whiptail --title "All done!" \ + --msgbox "Congrats! Provided there were no hidden errors, the script completed successfully and all the programs and configuration files should be in place.\\n\\nTo run the new graphical environment, log out and log back in as your new user, then run the command \"startx\" to start the graphical environment (it will start automatically in tty1).\\n\\n.t Luke" 13 80 } ### THE ACTUAL SCRIPT ### ### This is how everything happens in an intuitive format and order. -# Check if user is root on Arch distro. Install dialog. -pacman --noconfirm --needed -Sy dialog \ - || error "Are you sure you're running this as the root user, are on an Arch-based distribution and have an internet connection?" +# Check if user is root on Arch distro. Install whiptail. +pacman --noconfirm --needed -Sy libnewt || + error "Are you sure you're running this as the root user, are on an Arch-based distribution and have an internet connection?" # Welcome user and pick dotfiles. welcomemsg || error "User exited." @@ -220,17 +209,17 @@ preinstallmsg || error "User exited." ### The rest of the script requires no user input. # Refresh Arch keyrings. -refreshkeys \ - || error "Error automatically refreshing Arch keyring. Consider doing so manually." +refreshkeys || + error "Error automatically refreshing Arch keyring. Consider doing so manually." for x in curl ca-certificates base-devel git ntp zsh ; do - dialog --title "LARBS Installation" \ - --infobox "Installing \`$x\` which is required to install and configure other programs." 5 70 + whiptail --title "LARBS Installation" \ + --msgbox "Installing \`$x\` which is required to install and configure other programs." 8 70 installpkg "$x" done -dialog --title "LARBS Installation" \ - --infobox "Synchronizing system time to ensure successful and secure installation of software..." 4 70 +whiptail --title "LARBS Installation" \ + --msgbox "Synchronizing system time to ensure successful and secure installation of software..." 8 70 ntpdate 0.us.pool.ntp.org >/dev/null 2>&1 adduserandpass || error "Error adding username and/or password." @@ -239,7 +228,8 @@ adduserandpass || error "Error adding username and/or password." # Allow user to run sudo without password. Since AUR programs must be installed # in a fakeroot environment, this is required for all builds with AUR. -newperms "%wheel ALL=(ALL) NOPASSWD: ALL" +trap 'rm -f /etc/sudoers.d/larbs-temp' HUP INT QUIT TERM PWR EXIT +echo "%wheel ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/larbs-temp # Make pacman colorful, concurrent downloads and Pacman eye-candy. grep -q "ILoveCandy" /etc/pacman.conf || sed -i "/#VerbosePkgLists/a ILoveCandy" /etc/pacman.conf @@ -256,26 +246,18 @@ manualinstall yay || error "Failed to install AUR helper." # and all build dependencies are installed. installationloop -dialog --title "LARBS Installation" \ - --infobox "Finally, installing \`libxft-bgra\` to enable color emoji in suckless software without crashes." 5 70 +whiptail --title "LARBS Installation" \ + --msgbox "Finally, installing \`libxft-bgra\` to enable color emoji in suckless software without crashes." 8 70 yes | sudo -u "$name" $aurhelper -S libxft-bgra-git >/dev/null 2>&1 -# Install the dotfiles in the user's home directory +# Install the dotfiles in the user's home directory, but remove .git dir and +# other unnecessary files. putgitrepo "$dotfilesrepo" "/home/$name" "$repobranch" -rm -f "/home/$name/README.md" "/home/$name/LICENSE" "/home/$name/FUNDING.yml" -# Create default urls file if none exists. -[ ! -f "/home/$name/.config/newsboat/urls" ] && echo "http://lukesmith.xyz/rss.xml -https://videos.lukesmith.xyz/feeds/videos.xml?videoChannelId=2 -https://lindypress.net/rss.xml -https://notrelated.xyz/rss.xml -https://www.youtube.com/feeds/videos.xml?channel_id=UC2eYFnH61tmytImy1mTYvhA \"~Luke Smith (YouTube)\" -https://artixlinux.org/feed.php \"tech\" -https://www.archlinux.org/feeds/news/" > "/home/$name/.config/newsboat/urls" -# make git ignore deleted LICENSE & README.md files -git update-index --assume-unchanged "/home/$name/README.md" "/home/$name/LICENSE" "/home/$name/FUNDING.yml" +rm -rf "/home/$name/.git/" "/home/$name/README.md" "/home/$name/LICENSE" "/home/$name/FUNDING.yml" # Most important command! Get rid of the beep! -systembeepoff +rmmod pcspkr +echo "blacklist pcspkr" > /etc/modprobe.d/nobeep.conf # Make zsh the default shell for the user. chsh -s /bin/zsh "$name" >/dev/null 2>&1 @@ -289,7 +271,7 @@ dbus-uuidgen > /var/lib/dbus/machine-id # Use system notifications for Brave on Artix echo "export \$(dbus-launch)" > /etc/profile.d/dbus.sh -# Tap to click +# Enable tap to click [ ! -f /etc/X11/xorg.conf.d/40-libinput.conf ] && printf 'Section "InputClass" Identifier "libinput touchpad catchall" MatchIsTouchpad "on" @@ -299,11 +281,11 @@ echo "export \$(dbus-launch)" > /etc/profile.d/dbus.sh Option "Tapping" "on" EndSection' > /etc/X11/xorg.conf.d/40-libinput.conf -# This line, overwriting the `newperms` command above will allow the user to run -# serveral important commands, `shutdown`, `reboot`, updating, etc. without a password. -newperms "%wheel ALL=(ALL) ALL #LARBS -%wheel ALL=(ALL) NOPASSWD: /usr/bin/shutdown,/usr/bin/reboot,/usr/bin/systemctl suspend,/usr/bin/wifi-menu,/usr/bin/mount,/usr/bin/umount,/usr/bin/pacman -Syu,/usr/bin/pacman -Syyu,/usr/bin/packer -Syu,/usr/bin/packer -Syyu,/usr/bin/systemctl restart NetworkManager,/usr/bin/rc-service NetworkManager restart,/usr/bin/pacman -Syyu --noconfirm,/usr/bin/loadkeys,/usr/bin/paru,/usr/bin/pacman -Syyuw --noconfirm" +# Allow wheel users to sudo with password and allow several system commands +# (like `shutdown` to run without password). +echo "%wheel ALL=(ALL) ALL #LARBS" > /etc/sudoers.d/larbs-wheel-can-sudo +echo "%wheel ALL=(ALL) NOPASSWD: /usr/bin/shutdown,/usr/bin/reboot,/usr/bin/systemctl suspend,/usr/bin/wifi-menu,/usr/bin/mount,/usr/bin/umount,/usr/bin/pacman -Syu,/usr/bin/pacman -Syyu,/usr/bin/pacman -Syyu --noconfirm,/usr/bin/loadkeys,/usr/bin/paru,/usr/bin/pacman -Syyuw --noconfirm" > /etc/sudoers.d/larbs-cmds-without-password # Last message! Install complete! finalize -clear +#clear