From 0c836267281f78982d9e408d808325676faed7b8 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sun, 9 Oct 2016 23:12:57 -0700
Subject: [PATCH] [macOS] Invoke task fixups

---
 tasks/osx.py | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/tasks/osx.py b/tasks/osx.py
index cf7cce8a..eaefc425 100644
--- a/tasks/osx.py
+++ b/tasks/osx.py
@@ -9,8 +9,8 @@ from . import util
 def setup(ctx):
     brew(ctx)
     brew_essential(ctx)
-    access_for_assistive_devices(ctx)
     tccutil(ctx)
+    access_for_assistive_devices(ctx)
     karabiner(ctx)
     locate(ctx)
     set_path_for_launchd(ctx)
@@ -93,15 +93,16 @@ def access_for_assistive_devices(ctx):
         user_application = os.path.expanduser('~' + app_string)
         access_if_exists(ctx, user_application)
         access_if_exists(ctx, app_string)
-        access_if_exists(
-            ctx,
-            "/Applications/Karabiner.app/"
-        )
-        access_if_exists(
-            ctx,
-            "/Applications/Karabiner.app/Contents/Applications/"
-            "Karabiner_AXNotifier.app"
-        )
+
+    access_if_exists(
+        ctx,
+        "/Applications/Karabiner.app/"
+    )
+    access_if_exists(
+        ctx,
+        "/Applications/Karabiner.app/Contents/Applications/"
+        "Karabiner_AXNotifier.app"
+    )
 
 SYNERGY_BINARIES_PATH = '/Applications/Synergy.app/Contents/MacOS/'
 
@@ -114,18 +115,18 @@ 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"')
     for script in SCRIPTS_NEEDING_ASSISTIVE_DEVICE_ACCESS:
-        ctx.run(
-            'sudo tccutil -i "{}"'.format(script)
-        )
-        ctx.run(
-            'sudo tccutil -e "{}"'.format(script)
-        )
+        command = 'sudo tccutil.py -i "{0}" && sudo tccutil.py -e "{0}"'.format(script)
+        print(command)
+        ctx.run(command)
 
 
 def access_if_exists(ctx, app_string):
+    print("attempting access for {0}".format(app_string))
     if os.path.exists(app_string):
-        print("enabling access for {0}", app_string)
+        print("enabling access for {0}".format(app_string))
         ctx.run(
             'zsh -c "source ~/.zshrc && '
             'enable_access_for_assistive_devices \"{0}\""'.format(