Merge branch 'master' of https://github.com/thytom/dwmbar

2 files changed, 15 insertions, 3 deletions

diff --git a/dwmbar b/dwmbar
index 937ca55..195bd31 100755
--- a/dwmbar
+++ b/dwmbar
@@ -1,7 +1,7 @@
 #!/bin/bash
 VERSION="0.0.1"
 
-RC_LOCATION="/home/$USER/.config/dwmbar/dwmbarrc"
+RC_LOCATION="./dwmbarrc"
 
 if [[ -f $DEFAULT_RC_LOCATION ]]; then
 	>&2 echo "No dwmbarrc found."
diff --git a/dwmbarrc b/dwmbarrc
index 1601db7..dbedf22 100755
--- a/dwmbarrc
+++ b/dwmbarrc
@@ -1,10 +1,22 @@
 #!/bin/bash
 
-modules(){
+MODULES_DIR="modules/"
+
+SEPARATOR=" | "
+
+MODULES="test archupdates weather date time"
+
+run_modules(){
+	for module in $MODULES; do
+		[[ ! "$OUTPUT" = "" ]] && OUTPUT="$OUTPUT$SEPARATOR"
+
+		OUTPUT="$OUTPUT$(exec $MODULES_DIR$module)"
+	done
 }
 
 run(){
-	echo "Test"
+	run_modules
+	echo $OUTPUT
 }
 
 run