From 5039b83a4c8d6e45de152a4c1ed5c57bf3050d2e Mon Sep 17 00:00:00 2001
From: Luke <luke@lukesmith.xyz>
Date: Sat, 20 Jan 2018 10:17:32 -0700
Subject: [PATCH] general cleanup, testing redirect added

---
 src/larbs.sh      | 10 +++++-----
 src/larbs_user.sh |  7 +++----
 www/.htaccess     |  1 +
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/larbs.sh b/src/larbs.sh
index c4c33a9..93db4b4 100755
--- a/src/larbs.sh
+++ b/src/larbs.sh
@@ -37,7 +37,7 @@ options=(1 "LaTeX packages" off
          4 "Blender" off
 	 5 "Emacs" off
 	 6 "Fonts for unicode and other languages" off
-	 7 "transmission torrent client" off
+	 7 "Transmission torrent client" off
 	 8 "Music visualizers and decoration" off
 	 )
 choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
@@ -102,20 +102,21 @@ sleep .5
 
 blue \[1\/6\] Now installing main programs \(system basics\)...
 
-pacman --noconfirm --needed -Sy git
+pacman --noconfirm --needed -Sy git base-devel
 
 cd /tmp
 git clone https://github.com/lukesmithxyz/st.git
 cd st
 patch < patches/transparency.diff
 make && make install
+cd /tmp
 
 pacman --noconfirm --needed -Sy \
-	base-devel \
 	xorg-xinit \
 	xorg-server \
 	compton \
 	arandr \
+	ttf-inconsolata \
 	noto-fonts \
 	unzip \
 	unrar \
@@ -169,7 +170,6 @@ pacman --noconfirm --needed -Sy \
 	ffmpeg \
 	pulseaudio \
 	pulseaudio-alsa \
-	pavucontrol \
 	pamixer \
 	mpd \
 	mpc \
@@ -303,7 +303,7 @@ curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/src/sudoers_tmp
 cd /tmp
 blue Changing working directory to /tmp/...
 blue Downloading next portion of the script \(larbs_user.sh\)...
-curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/src/larbs_user.sh > /tmp/larbs_user.sh && blue Running larbs_user.sh script as $NAME...
+curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/testing/src/larbs_user.sh > /tmp/larbs_user.sh && blue Running larbs_user.sh script as $NAME...
 sudo -u $NAME bash /tmp/larbs_user.sh || red Error when running larbs_user.sh...
 rm -f /tmp/larbs_user.sh
 
diff --git a/src/larbs_user.sh b/src/larbs_user.sh
index d06ffc7..744299c 100755
--- a/src/larbs_user.sh
+++ b/src/larbs_user.sh
@@ -47,11 +47,11 @@ EOF
 
 gpg --recv-keys 5FAF0A6EE7371805 #Add the needed gpg key for neomutt
 
-aurcheck packer i3-gaps siji-git vim-pathogen tamzen-font-git neomutt unclutter-xfixes-git polybar python-pywal xfce-theme-blackbird fzf-git || red Error with basic AUR installations...
+aurcheck packer i3-gaps siji-git vim-pathogen neomutt unclutter-xfixes-git polybar  xfce-theme-blackbird fzf-git || red Error with basic AUR installations...
 #Also installing i3lock, since i3-gaps was only just now installed.
 sudo pacman -S --noconfirm --needed i3lock
 
-#packer --noconfirm -S ncpamixer-git speedometer cli-visualizer
+packer --noconfirm -S ncpamixer-git
 
 choices=$(cat /tmp/.choices)
 for choice in $choices
@@ -100,5 +100,4 @@ blue Downloading config files...
 git clone https://github.com/lukesmithxyz/voidrice.git && rsync -va voidrice/ /home/$NAME && rm -rf voidrice
 
 blue Generating bash/ranger/qutebrowser shortcuts...
-cd /home/$NAME/
-python /home/$NAME/.config/Scripts/shortcuts.py
+bash /home/$NAME/.config/Scripts/shortcuts.sh
diff --git a/www/.htaccess b/www/.htaccess
index 5087f2e..5695230 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -3,3 +3,4 @@ RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule ^([^\.]+)$ $1.html [NC,L]
 Redirect /larbs.sh https://raw.githubusercontent.com/LukeSmithxyz/LARBS/master/src/larbs.sh
 Redirect /arch.sh https://raw.githubusercontent.com/LukeSmithxyz/LARBS/master/src/arch.sh
+Redirect /testing.sh https://raw.githubusercontent.com/LukeSmithxyz/LARBS/testing/src/larbs.sh