Working on cleanup

wm/setup.sh

@@ -1,16 +1,26 @@
 #!/usr/bin/env bash
 
-function setup_wm()
+function main()
 {
-  brew crisidev/homebrew-chunkwm/chunkwm
-  brew koekeishiya/formulae/khd
-  ln -s ${DOTFILES}/wm/khdrc ${HOME}/.khdrc
-  ln -s ${DOTFILES}/wm/chunkwmrc ${HOME}/.chunkwmrc
-  if ! /usr/local/bin/brew services list | grep chunkwm >/dev/null; then
-    /usr/local/bin/brew services start khd
-    /usr/local/bin/brew services start chunkwm
+  # Install chunkwm and khd
+  if ! brew list | grep chunkwm >/dev/null; then
+    brew install crisidev/homebrew-chunkwm/chunkwm
+    brew install koekeishiya/formulae/khd
+  fi
+
+  # Link configuration files
+  if [ ! -e "${HOME}/.chunkwmrc" ]; then
+    rm -f "${HOME}/.chunkwmrc"
+    rm -f "${HOME}/.khdrc"
+    ln -s ${DOTFILES}/wm/khdrc ${HOME}/.khdrc
+    ln -s ${DOTFILES}/wm/chunkwmrc ${HOME}/.chunkwmrc
+  fi
+
+  # Start services
+  if ! brew services list | grep chunkwm >/dev/null; then
+    brew services start khd
+    brew services start chunkwm
   fi
 }
 
-export DOTFILES=/Users/thomas/dotfiles
-setup_wm
+main