From d25c046ab965c1644c89ec71ab746a4b4c60f567 Mon Sep 17 00:00:00 2001
From: Luke <luke@lukesmith.xyz>
Date: Sat, 7 Oct 2017 14:22:14 -0700
Subject: [PATCH] sudo changes

---
 .install_packages.sh.swp | Bin 20480 -> 0 bytes
 arch.sh                  |   2 --
 aur_packages.sh          |   4 ++--
 install_packages.sh      |   2 +-
 user.sh                  |   2 --
 5 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 .install_packages.sh.swp

diff --git a/.install_packages.sh.swp b/.install_packages.sh.swp
deleted file mode 100644
index af9adc29b59667266c7f64156bc1dbf5a10bc331..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20480
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
Q4M*^BCZc<6t~?y{U*1h(8vp<R

diff --git a/arch.sh b/arch.sh
index 01a250f..e507052 100755
--- a/arch.sh
+++ b/arch.sh
@@ -10,8 +10,6 @@ RED='\033[0;31m'
 BLUE='\033[0;34m'
 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 "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/aur_packages.sh b/aur_packages.sh
index 91afa3c..28d9f7f 100755
--- a/aur_packages.sh
+++ b/aur_packages.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-blue() { printf "\033[0;34m $* \033[0m\n" && (echo $* >> LARBS.log) ;}
-red() { printf "\033[0;31m $* \033[0m\n" && (echo ERROR: $* >> LARBS.log) ;}
+blue() { printf "\033[0;34m $* \033[0m\n" && (sudo echo $* >> LARBS.log) ;}
+red() { printf "\033[0;31m $* \033[0m\n" && (sudo echo ERROR: $* >> LARBS.log) ;}
 
 #Install an AUR package manually.
 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 ;}
diff --git a/install_packages.sh b/install_packages.sh
index 78db085..d31d326 100755
--- a/install_packages.sh
+++ b/install_packages.sh
@@ -37,7 +37,7 @@ if [[ -e .firstrun ]]
 then
 	dialog --title "Let's get this party started!" --msgbox "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'll can relax even more with your complete system.\n\nNow just press <OK> and the system will begin installation!" 13 60
 	blue Now installing main programs...
-	sudo pacman --noconfirm --needed -S base-devel xorg-xinit xorg-server rxvt-unicode feh ffmpeg pulseaudio pulseaudio-alsa arandr pavucontrol pamixer mpv wget rofi vim w3m ranger mediainfo poppler highlight tmux calcurse htop newsbeuter mpd mpc ncmpcpp network-manager-applet networkmanager imagemagick atool libcaca compton transset-df markdown mupdf evince rsync git youtube-dl youtube-viewer cups screenfetch scrot unzip unrar ntfs-3g offlineimap msmtp notmuch notmuch-mutt dosfstools fzf r pandoc || (echo "Error installing basic packages. Check your internet connection and pacman keyring." >> LARBS.log && error)
+	sudo pacman --noconfirm --needed -S base-devel xorg-xinit xorg-server rxvt-unicode feh ffmpeg pulseaudio pulseaudio-alsa arandr pavucontrol pamixer mpv wget rofi vim w3m ranger mediainfo poppler highlight tmux calcurse htop newsbeuter mpd mpc ncmpcpp network-manager-applet networkmanager imagemagick atool libcaca compton transset-df markdown mupdf evince rsync git youtube-dl youtube-viewer cups screenfetch scrot unzip unrar ntfs-3g offlineimap msmtp notmuch notmuch-mutt dosfstools fzf r pandoc || (red Error installing basic packages. Check your internet connection and pacman keyring.)
 else
 	dialog --no-cancel --inputbox "Input the name of a non-root user to install AUR packages as." 10 60 2> .name
 fi
diff --git a/user.sh b/user.sh
index 398d166..bb33d52 100755
--- a/user.sh
+++ b/user.sh
@@ -8,8 +8,6 @@ blue Changing directory to /home/$USER...
 
 cd /home/$USER
 
-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 ;}
-
 blue Activating Pulseaudio if not already active...
 pulseaudio --start && blue Pulseaudio enabled...