diff --git a/dont_run_me.sh b/arch.sh similarity index 86% rename from dont_run_me.sh rename to arch.sh index b141444..75db0e2 100755 --- a/dont_run_me.sh +++ b/arch.sh @@ -12,7 +12,7 @@ NC='\033[0m' #error() { dialog --title "Error!" --msgbox "We've run into a fatal-ish error. Check the LARBS.log file for more information" 10 60 && clear && exit ;} -dialog --defaultno --title "DON'T BE A BRAINLET!" --yesno "Have you seen this file's filename? It's DONT_RUN_ME.SH!\n\nOnly run this script if you're a big-brane who doesn't mind deleting your entire /dev/sda drive.\n\nThis script is only really for me so I can autoinstall Arch.\n\nt. Luke" 15 60 || exit +dialog --defaultno --title "DON'T BE A BRAINLET!" --yesno "This is an Arch install script that is very rough around the edges.\n\nOnly run this script if you're a big-brane who doesn't mind deleting your entire /dev/sda drive.\n\nThis script is only really for me so I can autoinstall Arch.\n\nt. Luke" 15 60 || exit dialog --defaultno --title "DON'T BE A BRAINLET!" --yesno "Do you think I'm meming? Only select yes to DELET your entire /dev/sda and reinstall Arch.\n\nTo stop this script, press no." 10 60 || exit diff --git a/user.sh b/user.sh index 52d3a92..b746b85 100755 --- a/user.sh +++ b/user.sh @@ -14,15 +14,18 @@ pulseaudio --start printf "${BLUE}Installing packer as an AUR manager...\n${NC}" aurinstall() { curl -O https://aur.archlinux.org/cgit/aur.git/snapshot/$1.tar.gz && tar -xvf $1.tar.gz && cd $1 && makepkg --noconfirm -si && cd .. && rm -rf $1 $1.tar.gz ;} + qm=$(pacman -Qm | awk '{print $1}') + aurcheck() { for arg in "$@" do if [[ $qm = *"$arg"* ]]; then - echo $arg already installed. + echo $arg is already installed. else echo $arg not installed - aurinstall $arg + printf "${BLUE}\nNow installing $arg...\n${NC}" + aurinstall $arg && printf "${BLUE}\n$arg now installed.\n${NC}" fi done } @@ -31,6 +34,9 @@ aurcheck packer || (echo "Error installing packer." >> LARBS.log && error) printf "${BLUE}Installing AUR programs...\n${NC}" printf "${BLUE}(May take some time.)\n${NC}" +#Add the needed gpg key for neomutt + gpg --recv-keys 5FAF0A6EE7371805 + aurcheck i3-gaps vim-pathogen neofetch i3lock tamzen-font-git neomutt unclutter-xfixes-git urxvt-resize-font-git polybar-git python-pywal xfce-theme-blackbird || (echo "Error installing AUR packages. Check your internet connections and pacman keys." >> LARBS.log && error) #packer --noconfirm -S ncpamixer-git speedometer cli-visualizer @@ -42,6 +48,7 @@ do 1) printf "\n${BLUE}Now installing LaTeX packages...\n${NC}" aurcheck vim-live-latex-preview + git clone https://github.com/lukesmithxyz/latex-templates.git && mkdir -p /home/$USER/Documents/LaTeX && rsync -va latex-templates /home/$USER/Documents/LaTeX && rm -rf latex-templates ;; 6) printf "\n${BLUE}Now installing extra fonts...\n${NC}" @@ -71,7 +78,6 @@ done printf "${BLUE}Downloading config files...\n${NC}" git clone https://github.com/lukesmithxyz/voidrice.git && rsync -va voidrice/ /home/$USER && rm -rf voidrice -git clone https://github.com/lukesmithxyz/latex-templates.git && mkdir -p /home/$USER/Documents/LaTeX && rsync -va latex-templates /home/$USER/Documents/LaTeX && rm -rf latex-templates printf "${BLUE}Generating bash/ranger/qutebrowser shortcuts...\n${NC}" python ~/.config/Scripts/shortcuts.py