minor tweaks

This commit is contained in:
Luke Smith 2020-09-12 19:37:43 -04:00
parent 82f295e880
commit 8222b4cb87
No known key found for this signature in database
GPG Key ID: 4C50B54A911F6252

View File

@ -65,7 +65,8 @@ adduserandpass() { \
refreshkeys() { \ refreshkeys() { \
dialog --infobox "Refreshing Arch Keyring..." 4 40 dialog --infobox "Refreshing Arch Keyring..." 4 40
pacman --noconfirm -Sy archlinux-keyring >/dev/null 2>&1 pacman --noconfirm -S archlinux-keyring >/dev/null 2>&1
pacman -Q artix-keyring >/dev/null 2>&1 && pacman --noconfirm -S archlinux-keyring >/dev/null 2>&1
} }
newperms() { # Set special sudoers settings for install (or after). newperms() { # Set special sudoers settings for install (or after).
@ -149,7 +150,7 @@ finalize(){ \
### This is how everything happens in an intuitive format and order. ### This is how everything happens in an intuitive format and order.
# Check if user is root on Arch distro. Install dialog. # Check if user is root on Arch distro. Install dialog.
installpkg dialog || error "Are you sure you're running this as the root user, are on an Arch-based distribution and have an internet connection?" 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?"
# Welcome user and pick dotfiles. # Welcome user and pick dotfiles.
welcomemsg || error "User exited." welcomemsg || error "User exited."
@ -204,10 +205,9 @@ 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
putgitrepo "$dotfilesrepo" "/home/$name" "$repobranch" putgitrepo "$dotfilesrepo" "/home/$name" "$repobranch"
rm -f "/home/$name/README.md" "/home/$name/LICENSE" "/home/$name/FUNDING.yml" rm -f "/home/$name/"{README.md,LICENSE,FUNDING.yml}
# make git ignore deleted LICENSE & README.md files # make git ignore deleted LICENSE & README.md files
git update-index --assume-unchanged "/home/$name/README.md" git update-index --assume-unchanged "/home/$name/"{README.md,LICENSE,FUNDING.yml}
git update-index --assume-unchanged "/home/$name/LICENSE"
# Most important command! Get rid of the beep! # Most important command! Get rid of the beep!
systembeepoff systembeepoff