fix to USER persistence

This commit is contained in:
Luke 2017-10-06 11:06:37 -07:00
parent cc77af8475
commit fe93a732ce
3 changed files with 10 additions and 6 deletions

View File

@ -37,7 +37,7 @@ blue \(This may take some time.\)
#Add the needed gpg key for neomutt #Add the needed gpg key for neomutt
gpg --recv-keys 5FAF0A6EE7371805 gpg --recv-keys 5FAF0A6EE7371805
aurcheck packer i3-gaps vim-pathogen neofetch tamzen-font-git neomutt unclutter-xfixes-git urxvt-resize-font-git polybar-git python-pywal xfce-theme-blackbird aurcheck packer i3-gaps vim-pathogen neofetch tamzen-font-git neomutt unclutter-xfixes-git urxvt-resize-font-git polybar-git python-pywal xfce-theme-blackbird || red Error with basic AUR installations...
#Also installing i3lock, since i3-gaps was only just now installed. #Also installing i3lock, since i3-gaps was only just now installed.
sudo pacman -S --noconfirm --needed i3lock sudo pacman -S --noconfirm --needed i3lock

View File

@ -98,9 +98,10 @@ then
sudo -u $USER bash /home/$USER/user.sh || red Error when running user.sh... sudo -u $USER bash /home/$USER/user.sh || red Error when running user.sh...
rm -f /home/$USER/user.sh rm -f /home/$USER/user.sh
else else
USER=$(cat .name) USER=$(cat .name) || red Could not retreive username...
blue Downloading next portion of the script \(aur_packages.sh\)... blue Downloading next portion of the script \(aur_packages.sh\)...
curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/aur_packages.sh > /home/$USER/aur_packages.sh && blue Running aur_packages as $USER... curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/aur_packages.sh > /home/$USER/aur_packages.sh && blue Running aur_packages as $USER...
sudo -u $USER bash /home/$USER/aur_packages.sh || red Error when running aur_packages... sudo -u $USER bash /home/$USER/aur_packages.sh || red Error when running aur_packages...
rm -f /home/$USER/aur_packages.sh rm -f /home/$USER/aur_packages.sh
fi fi
rm .firstrun

11
user.sh
View File

@ -1,14 +1,17 @@
#!/bin/bash #!/bin/bash
RED='\033[0;31m'
BLUE='\033[0;34m' blue() { printf "\033[0;34m $* \033[0m\n" && (echo $* >> LARBS.log) ;}
NC='\033[0m' red() { printf "\033[0;31m $* \033[0m\n" && (echo ERROR: $* >> LARBS.log) ;}
USER=$(cat .firstrun)
blue Changing directory to /home/$USER... blue Changing directory to /home/$USER...
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 ;} 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... blue Activating Pulseaudio if not already active...
pulseaudio --start pulseaudio --start && blue Pulseaudio enabled...
curl -O http://lukesmith.xyz/larbs/aur_install.sh && bash aur_install.sh curl -O http://lukesmith.xyz/larbs/aur_install.sh && bash aur_install.sh
rm aur_install.sh rm aur_install.sh