From 6d954f418f48b1a81a97acdc6649f86e7abd378a Mon Sep 17 00:00:00 2001 From: Luke Date: Thu, 5 Oct 2017 21:59:38 -0700 Subject: [PATCH] shit, I hope that fixed something lmao --- .aur_packages.sh.swp | Bin 12288 -> 0 bytes install_packages.sh | 29 ++++++++++++++--------------- user.sh | 8 ++++---- 3 files changed, 18 insertions(+), 19 deletions(-) delete mode 100644 .aur_packages.sh.swp diff --git a/.aur_packages.sh.swp b/.aur_packages.sh.swp deleted file mode 100644 index 1a541becf7df990e1083b45f0b1d79ec3038e779..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2J!~9B6vxL%d>kZzpa4Ph;yWdFl-;#+@rPm(FpeVyg)cin3APDyyK{G&+uhmh z%%1O@uZ9+SQb2`hQjrEJp@0@eLP7`$2?`2Y3Q{7(fA;Qt#tDigXd=x?KkvtUz4xE@ zp3m~sCf+&mI?cKh44%toulm$)?$n^g}^7O7qy-9yhlb9(3F zZBMI!Rlq7>6|f3e1*`&A0jq#j;DJ{_rz7ktym+YZ$!q=V$hK?$(O#?qRspMkRlq7> z6|f3e1*`&A0jq#jz$#!BcmNgP0b?tVF!t%AFdqN^AN>7)=PAbi0N24e@E&*xeDow^ zAA&!3Gxj_97Tg41f@`1)6nGaL0R&zE-|S-S7LcF?&VvT1f%m~VFa>^jg0Y{$SKt=7 z20jKkI0cr$jmI$$I1A2z=fQK}uM%UwfnULG@HP0vJmW0G58ylS1-K4A2UkHCNDzXz zzznE@J>W%f2fF+Oz6ZC#4R9TN28?Dmf&EwotO8a6tAJJDe^#Iz$V9MGSt#zaQmIs) zn=39jFy}Xg-=cM{MOK#`rxqq?DIXfYXSb9`B9=1gcPo`E)JPlTIGOO59&HqT*1g5O!uTR}06FLZ=aGSTSQ9yK4vzHSxp`MWUU$ zOteDB>G5I}v(lhHW*|Sp`qb1qRfjzfZ<=|{^=0gtLy1^cH#^-897oim<7g45=1#e0 zKJB7GAFgN#5a*G<_F2_-_- zh4!1IdAuQ#B0372(GcfaQ=a${uJEK&heN7p%(G5gBlZ-07!FBg)UENJ%V`%2Bu?60 z=Mi=4zHoF?#KNgX(5n_^0pWY?w#=G3K7V{-etL0nraCh@J23?nf`Bj%R*FCbMJgf( z$s|?ZK72EdazU$Or<$Rnn0MhwOOS%vq{CRatJtKX%ZZ_w^QV_6&156vv2tCPF+bQE zcy#F!Wms-O=1~AukrXgPZtddIF)0+~$YtV5KqlM?u`hfrvo48FsPxOdbr+gEX_ze> zHgB8DSa6vYd0!71E8$0}G=}Z#?>|*|)-Y*P_)$FkW2?sp1}|nAl-UwBrmxFNB2p-h zrLlX*>VKUb8-$V?)@fyh96?^LG7nYO>#w%9#!7|ZZw$lJ$Whn^*GmG~)N|2D-M3x@ z%veoZo3X(>$^;L(!(J}yEnK+}(-GP~YGxhXPit#)CU6p{%1pEv0mFnwE3b^Q3o+7o zka2Ivbcy(Si}qbip|_^WhH_8YX3pUU@q}FvUdc z;0?iG2M9VNXjDh6mSwzm8 zn^halF2^rERF1sk%BDqRQhSw2S984EFu{d8aysog6xi|>kzbiC zN;}djZJA$%TMC^DO%wXKuDLO_57ik1hI7naX5|yT)I+9Fk$Sxo>{}f|x)q)jdr+s* z)ro3#Wn!*68B=9H^`7F@WYnxORs_uA($bqthfV9zqjYk9>D6U7l8te~dM4WLIoqLs So$X%Ju=1WFj%yqz?f(V> LARBS.log) ;} +red() { printf "\033[0;31m $* \033[0m\n" && (echo ERROR: $* >> LARBS.log) ;} pacman -S --noconfirm dialog || (echo "Error at script start: Are you sure you're running this as the root user? Are you sure you have an internet connection?" && exit) -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 ;} @@ -33,7 +32,7 @@ clear 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 - printf "\n${BLUE}Now installing main programs.\n${NC}" + blue Now installing main programs... 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) fi @@ -41,31 +40,31 @@ for choice in $choices do case $choice in 1) - printf "\n${BLUE}Now installing LaTeX packages...\n${NC}" + blue Now installing LaTeX packages... pacman --noconfirm --needed -S texlive-most texlive-lang biber ;; 2) - printf "\n${BLUE}Now installing Libreoffice suite...\n${NC}" + blue Now installing LibreOffice Suite... pacman --noconfirm --needed -S libreoffice-fresh ;; 3) - printf "\n${BLUE}Now installing GIMP...\n${NC}" + blue Now installing GIMP... pacman --noconfirm --needed -S gimp ;; 4) - printf "\n${BLUE}Now installing Blender...\n${NC}" + blue Now installing Blender... pacman --noconfirm --needed -S blender ;; 5) - printf "\n${BLUE}Now installing Emacs...\n${NC}" + blue Now installing Emacs... pacman --noconfirm --needed -S emacs ;; 6) - printf "\n${BLUE}Now installing extra fonts...\n${NC}" + blue Now installing extra fonts... pacman --noconfirm --needed -S noto-fonts-cjk noto-fonts-emoji ;; 7) - printf "\n${BLUE}Now installing transmission...\n${NC}" + blue Now installing transmission... pacman --noconfirm --needed -S transmission-cli esac done @@ -74,19 +73,19 @@ for choice in $browch do case $choice in 1) - printf "\n${BLUE}Now installing qutebrowser...\n${NC}" + blue Now installing qutebrowser... pacman --noconfirm --needed -S qutebrowser gst-libav gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly ;; 2) - printf "\n${BLUE}Now installing Firefox...\n${NC}" + blue Now installing Firefox... pacman --noconfirm --needed -S firefox ;; 3) - printf "\n${BLUE}Now installing Palemoon...\n${NC}" + blue Now installing Palemoon... pacman --noconfirm --needed -S palemoon-bin ;; 4) - printf "\n${BLUE}Now installing Waterfox...\n${NC}" + blue Now installing Waterfox... pacman --noconfirm --needed -S waterfox-bin ;; esac diff --git a/user.sh b/user.sh index 99ee961..54436fa 100755 --- a/user.sh +++ b/user.sh @@ -2,12 +2,12 @@ RED='\033[0;31m' BLUE='\033[0;34m' NC='\033[0m' -printf "${BLUE}Changing directory to /home/$USER...\n${NC}" +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 ;} -printf "${BLUE}Activating Pulseaudio if not already active...\n${NC}" +blue Activating Pulseaudio if not already active... pulseaudio --start #curl -O http://lukesmith.xyz/larbs/aur_install.sh && bash aur_install.sh @@ -15,8 +15,8 @@ pulseaudio --start curl -O http://lukesmith.xyz/larbs/install_packages.sh bash install_packages.sh -printf "${BLUE}Downloading config files...\n${NC}" +blue Downloading config files... git clone https://github.com/lukesmithxyz/voidrice.git && rsync -va voidrice/ /home/$USER && rm -rf voidrice -printf "${BLUE}Generating bash/ranger/qutebrowser shortcuts...\n${NC}" +blue Generating bash/ranger/qutebrowser shortcuts... python ~/.config/Scripts/shortcuts.py