From ecb77cab2a0501ba99771b55959fbc5226ddcbea Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Tue, 18 Oct 2016 20:49:42 -0700
Subject: [PATCH 1/6] [Shell] Add process_running function

---
 dotfiles/lib/shellenv/functions.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dotfiles/lib/shellenv/functions.sh b/dotfiles/lib/shellenv/functions.sh
index eb294624..bde28fc4 100644
--- a/dotfiles/lib/shellenv/functions.sh
+++ b/dotfiles/lib/shellenv/functions.sh
@@ -445,6 +445,10 @@ function in_git_directory {
     [ -d .git ]
 }
 
+function process_running {
+    [[ ! -z "$(pgrep $@)" ]]
+}
+
 function which_readlink {
     readlink -f "$(which $1)"
 }

From 91264f659fa56398b650b7c6e7c2cac4c0f0bf6a Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Tue, 18 Oct 2016 20:50:10 -0700
Subject: [PATCH 2/6] [macOS] Update default dependencies

---
 tasks/brewfiles/default | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tasks/brewfiles/default b/tasks/brewfiles/default
index 01e203db..07756d02 100644
--- a/tasks/brewfiles/default
+++ b/tasks/brewfiles/default
@@ -38,6 +38,7 @@ brew 'reattach-to-user-namespace'
 brew 'rust'
 brew 'sbt'
 brew 'scala'
+brew 'stack'
 brew 'sqlite'
 brew 'the_silver_searcher'
 brew 'thrift'
@@ -56,11 +57,14 @@ cask 'google-hangouts'
 cask 'gpgtools'
 cask 'iterm2'
 cask 'java'
-cask 'karabiner'
+cask 'karabiner-elements'
 cask 'macpass'
+cask 'mactex'
 cask 'mirrordisplays'
 cask 'osxfuse'
+cask 'steam'
 cask 'slate'
+cask 'sling'
 cask 'sparkleshare'
 cask 'spotify'
 cask 'synergy'

From bc4b6be198e8d801c7327d151b43f4007abc85ec Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Tue, 18 Oct 2016 20:50:35 -0700
Subject: [PATCH 3/6] [macOS] Update tccutil command

---
 tasks/osx.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tasks/osx.py b/tasks/osx.py
index eaefc425..856f2669 100644
--- a/tasks/osx.py
+++ b/tasks/osx.py
@@ -115,10 +115,11 @@ SCRIPTS_NEEDING_ASSISTIVE_DEVICE_ACCESS = [
 
 @ctask
 def tccutil(ctx):
-    ctx.run('wget -O "$HOME/.lib/bin/tccutil.py" "https://raw.githubusercontent.com/IvanMalison/tccutil/master/tccutil.py"')
-    ctx.run('chmod 755 "$HOME/.lib/bin/tccutil.py"')
+    if not os.path.exists(os.path.expanduser("~/.lib/bin/tccutil.py")):
+        ctx.run('wget -O "$HOME/.lib/bin/tccutil.py" "https://raw.githubusercontent.com/IvanMalison/tccutil/master/tccutil.py"')
+        ctx.run('chmod 755 "$HOME/.lib/bin/tccutil.py"')
     for script in SCRIPTS_NEEDING_ASSISTIVE_DEVICE_ACCESS:
-        command = 'sudo tccutil.py -i "{0}" && sudo tccutil.py -e "{0}"'.format(script)
+        command = 'sudo tccutil.py -v -i "{0}" && sudo tccutil.py -v -e "{0}"'.format(script)
         print(command)
         ctx.run(command)
 

From 337fae68cbbd7f2e8e70eece1dddc35240e873be Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Tue, 18 Oct 2016 20:50:47 -0700
Subject: [PATCH 4/6] [macOS] Update essential brew deps

---
 tasks/brewfiles/essential | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tasks/brewfiles/essential b/tasks/brewfiles/essential
index 2b32b74f..7bb8415c 100644
--- a/tasks/brewfiles/essential
+++ b/tasks/brewfiles/essential
@@ -1,5 +1,6 @@
 tap 'thoughtbot/formulae'
 
+brew 'cask'
 brew 'coreutils'
 brew 'emacs', args: ['with-cocoa', 'with-librsvg', 'with-gnutls', 'with-imagemagick']
 brew 'findutils'
@@ -29,6 +30,7 @@ cask 'gpgtools'
 cask 'iterm2'
 cask 'java'
 cask 'karabiner'
+cask 'macpass'
 cask 'slate'
 cask 'sparkleshare'
 cask 'spotify'

From 51dadf5bfcdb439b512495839b221ec450052d80 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Tue, 18 Oct 2016 20:51:14 -0700
Subject: [PATCH 5/6] [Synergy] Fix start_client_at

---
 dotfiles/lib/shellenv/synergy.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotfiles/lib/shellenv/synergy.sh b/dotfiles/lib/shellenv/synergy.sh
index 44667a8d..4807b694 100644
--- a/dotfiles/lib/shellenv/synergy.sh
+++ b/dotfiles/lib/shellenv/synergy.sh
@@ -1,7 +1,7 @@
 SYNERGY_CONF="$HOME/.synergy.conf"
 
 synergy_start_client_at() {
-    ssh "$1" 'test -z $(pgrep synergyc) || synergyc '"$(localip)"'; ps aux | grep synergyc'
+    ssh "$1" '[[ -z "$(pgrep synergyc)" ]] && synergyc '"$(localip)"
 }
 
 synergy_start_server_here() {

From 08d99b30a69cd5471785e2e39a26339ce0a15e45 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Tue, 18 Oct 2016 20:51:39 -0700
Subject: [PATCH 6/6] [Emacs] Remove irrelevant comment about puml-mode

---
 dotfiles/emacs.d/README.org | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org
index 2c2c40c9..006d157c 100644
--- a/dotfiles/emacs.d/README.org
+++ b/dotfiles/emacs.d/README.org
@@ -3096,7 +3096,6 @@ Intero seems to be causing hangs, so it has been disabled
     (add-hook 'markdown-mode-hook 'imalison:disable-linum-mode)))
 #+END_SRC
 *** plantuml-mode
-This mode seems to be better maintained than plantuml-mode
 #+BEGIN_SRC emacs-lisp
 (use-package plantuml-mode
   :commands plantuml-mode