NapoleonDynamite/LARBS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Error handling improvements

Browse source
This commit is contained in:
Luke 2017-10-02 17:04:53 -04:00
parent a2651b9eab
commit 7249fc06e5
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
root.sh
View file

@ -81,7 +81,7 @@ brow=(dialog --separate-output --checklist "Select a browser (none or multiple p
options=(1 "qutebrowser" off # any option can be set to default to "on" options=(1 "qutebrowser" off # any option can be set to default to "on"
2 "Firefox" off 2 "Firefox" off
#3 "Palemoon" off #3 "Palemoon" off
#4 "Firefox" off #4 "Waterfox" off
) )
browch=$("${brow[@]}" "${options[@]}" 2>&1 >/dev/tty) browch=$("${brow[@]}" "${options[@]}" 2>&1 >/dev/tty)
clear clear
@ -114,13 +114,14 @@ systemctl enable NetworkManager
systemctl start NetworkManager systemctl start NetworkManager
printf "${BLUE}Downloading next portion of script...\n${NC}" printf "${BLUE}Downloading next portion of script...\n${NC}"
curl http://lukesmith.xyz/larbs/user.sh > /home/$USER/user.sh curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/user.sh > /home/$USER/user.sh
printf "${BLUE}Running script as new user $USER...\n${NC}" printf "${BLUE}Running script as new user $USER...\n${NC}"
cp /etc/sudoers /etc/sudoers.prelarbs cp /etc/sudoers /etc/sudoers.prelarbs
echo "%wheel ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers echo "%wheel ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
sudo -u $USER bash /home/$USER/user.sh || (echo "Error in the user install script. This might be because of a problem in your internet connection or pacman keyring or in an AUR package." >> LARBS.log && error) sudo -u $USER bash /home/$USER/user.sh || (echo "Error in the user install script. This might be because of a problem in your internet connection or pacman keyring or in an AUR package." >> LARBS.log && error)
cat /home$USER/LARBS.log >> LARBS.log && rm /home/$USER/LARBS.log
rm /home/$USER/user.sh
curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/sudoers > /etc/sudoers curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/sudoers > /etc/sudoers

6
user.sh
View file

@ -5,6 +5,8 @@ NC='\033[0m'
printf "${BLUE}Changing directory to /home/$USER...\n${NC}" printf "${BLUE}Changing directory to /home/$USER...\n${NC}"
cd /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 ;}
printf "${BLUE}Activating Pulseaudio if not already active...\n${NC}" printf "${BLUE}Activating Pulseaudio if not already active...\n${NC}"
pulseaudio --start pulseaudio --start
@ -13,11 +15,11 @@ 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 ;} 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 ;}
aurinstall packer || (echo "Error installing packer." && exit) aurinstall packer || (echo "Error installing packer." >> LARBS.log && error)
printf "${BLUE}Installing AUR programs...\n${NC}" printf "${BLUE}Installing AUR programs...\n${NC}"
printf "${BLUE}(May take some time.)\n${NC}" printf "${BLUE}(May take some time.)\n${NC}"
packer --noconfirm -S 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." && exit) packer --noconfirm -S 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 #packer --noconfirm -S ncpamixer-git speedometer cli-visualizer
choices=$(cat choices) choices=$(cat choices)
for choice in $choices for choice in $choices