Get github automation working on ubuntu

castervoice/lib/github_automation.py

@@ -10,7 +10,6 @@
 from castervoice.lib.utilities import load_toml_file
 from castervoice.lib import settings
 
-
 def _copy_path():
     if not os.path.isfile(settings.SETTINGS["paths"]["GIT_REPO_LOCAL_REMOTE_PATH"]):
         git_match_default = settings.SETTINGS["paths"]["GIT_REPO_LOCAL_REMOTE_DEFAULT_PATH"]
@@ -49,16 +48,16 @@ def github_checkoutupdate_pull_request(new):
                 TERMINAL_PATH = settings.SETTINGS["paths"]["TERMINAL_PATH"]
                 AHK_PATH = settings.SETTINGS["paths"]["AHK_PATH"]
                 ahk_installed = os.path.isfile(AHK_PATH)
-                print("AHK_PATH = " + AHK_PATH)
                 if TERMINAL_PATH != "":
                     load_terminal = True  # set default value
                     # ready fetch command string to be appended to
                     fetch_command = ""
                     # find the equivalent ahk script with the same name as this one
                     ahk_script = __file__.replace(".pyc", ".ahk").replace(".py", ".ahk")
-                    pattern_match = "MINGW64"  # the string we expect to find in the title of git bash when loaded
+
                     # if autohotkey is installed
                     if ahk_installed:
+                        pattern_match = "MINGW64"  # the string we expect to find in the title of git bash when loaded
                         # open the script which checks that git bash window is open or not
                         p = Popen([AHK_PATH, ahk_script, "exists", pattern_match], stdout=PIPE)
                         # retrieve the output from the ahk script
@@ -81,7 +80,10 @@ def github_checkoutupdate_pull_request(new):
                             print("Fallback: load new instance of :" + pattern_match)
                     if load_terminal:
                         # open up a new git bash terminal
-                        terminal = Popen(TERMINAL_PATH, cwd=local_directory)
+                        if os.path.isfile(TERMINAL_PATH):
+                            terminal = Popen(TERMINAL_PATH, cwd=local_directory)
+                        else:
+                            raise Exception("Error: terminal path not set correctly in settings.toml")
                         # if autohotkey is installed
                         if ahk_installed:
                             # open the script which checks that git bash windoow is ready or not for input

castervoice/lib/settings.py

@@ -242,14 +242,25 @@ def _deep_merge_defaults(data, defaults):
 
 
 def _get_defaults():
-    terminal_path_default = "C:/Program Files/Git/git-bash.exe"
+
+    if sys.platform == "win32":
+        terminal_path_default = "C:/Program Files/Git/git-bash.exe"
+    elif sys.platform.startswith("linux"):
+        terminal_path_default = "/usr/bin/gnome-terminal"
+    elif sys.platform == "darwin":
+        terminal_path_default = "/Applications/Utilities/Terminal.app"
+
     if not os.path.isfile(terminal_path_default):
         terminal_path_default = ""
 
     ahk_path_default = "C:/Program Files/AutoHotkey/AutoHotkey.exe"
     if not os.path.isfile(ahk_path_default):
         ahk_path_default = ""
-
+
+    if sys.platform == "win32": 
+        terminal_loading_time = 5 
+    else:
+        terminal_loading_time = 1
     return {
         "paths": {
             "BASE_PATH":
@@ -301,7 +312,7 @@ def _get_defaults():
 
             # EXECUTABLES
             "AHK_PATH":
-                str(Path(_BASE_PATH).joinpath(ahk_path_default)),
+                str(Path(ahk_path_default)),
             "DOUGLAS_PATH":
                 str(Path(_BASE_PATH).joinpath("asynch/mouse/grids.py")),
             "ENGINE_PATH":
@@ -365,8 +376,9 @@ def _get_defaults():
         },
 
         # gitbash settings
+        # This really should be labelled "terminal" but was named when caster was Windows only.
         "gitbash": {
-            "loading_time": 5,  # the time to initialise the git bash window in seconds
+            "loading_time": terminal_loading_time,  # the time to initialise the git bash window in seconds
             "fetching_time": 3  # the time to fetch a github repository in seconds
         },