diff --git a/.install_packages.sh.swp b/.install_packages.sh.swp deleted file mode 100644 index af9adc2..0000000 Binary files a/.install_packages.sh.swp and /dev/null differ 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 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...