From bb55aa342f59fbd2c36ff9bdda54b81688669b70 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Mon, 30 Oct 2017 04:55:38 -0700
Subject: [PATCH] Add some required packages for gorice to upgrade script,
 update gorice polybar module

---
 home/.config/polybar/modules.conf |  7 ++++---
 upgrade-archlabs                  | 11 +++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/home/.config/polybar/modules.conf b/home/.config/polybar/modules.conf
index 0fb9bc6e..fd7615b1 100644
--- a/home/.config/polybar/modules.conf
+++ b/home/.config/polybar/modules.conf
@@ -7,13 +7,14 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;
 [module/config]
 type = custom/script
-exec = echo ""
+format-prefix = " "
 interval = 5
+exec = grep "current" $HOME/.gorice/templates/i3/data.json | cut -d '"' -f22 | cut -d . -f1 | cut -d / -f2
 label = %output%
-label-padding = 2
+format-padding = 2
 format = <label>
 click-left = gorice dump i3 ~/.gorice/output.yaml.template; config_ui &
-click-right = termite "--exec=$HOME/go/bin/gorice edit i3/current" &
+click-right = termite "--exec=gorice edit i3/current" &
 
 
 
diff --git a/upgrade-archlabs b/upgrade-archlabs
index 53484454..b3e66cde 100755
--- a/upgrade-archlabs
+++ b/upgrade-archlabs
@@ -41,7 +41,7 @@ sleep 2
 sudo pacman-key --init
 sudo pacman-key --populate archlinux
 for key in "${KEYS[@]}"; do
-  if ! sudo pacman-key --list-keys | grep $key; then
+  if ! sudo pacman-key --list-keys | grep $key > /dev/null 2>&1; then
     gpg --receive-keys $key
     sudo pacman-key -r $key
   fi
@@ -49,12 +49,12 @@ done
 
 
 # add $REPO to pacman.conf
-if ! grep "archlabs_repo" /etc/pacman.conf; then
-  echo "$REPO" | sudo tee -a /etc/pacman.conf
+if ! grep "archlabs_repo" /etc/pacman.conf > /dev/null 2>&1; then
+  echo "$REPO" | sudo tee -a /etc/pacman.conf > /dev/null 2>&1
 
 else  # if entries exist remove them
   sudo sed -i '/archlabs_repo/d' /etc/pacman.conf
-  echo "$REPO" | sudo tee -a /etc/pacman.conf
+  echo "$REPO" | sudo tee -a /etc/pacman.conf > /dev/null 2>&1
 
 fi
 
@@ -98,6 +98,9 @@ echo "##########################################################################
 ############################################################################################"
 sleep 2
 
+# install packages needed for configs
+sudo pacman -S clutter-gtk libgee gdk-pixbuf2 pango python-yaml --needed --noconfirm
+
 # cleanup ~/.config
 rm -rf "$HOME"/.config/{bspwm,dunst,i3,obmenu-generator,qt5ct,Thunar,conky,geany,neofetch,polybar,termite,xfce4,openbox}