Merge pull request #69 from lovato/feature/fixwin10newwindow

Feature/fixwin10newwindow

hooks4git/hook.py

@@ -87,7 +87,9 @@ def run_hook_cmd(command, files):
     # backward compatibility to 0.3.x
     if cmd[0:21] == "h4g/check_branch_name":
         _command = shlex.split(command)
-        command = _command[0] + ' "' + _command[1] + '"'
+        command = _command[0]
+        if len(_command) > 1:
+            command = command + ' "' + _command[1] + '"'
     # end
 
     cmd_list = cmd.split("/")
@@ -112,7 +114,12 @@ def run_hook_cmd(command, files):
             display_message += " " + _arg.replace(git_root, ".")[: (66 - len(display_message))] + "..."
 
     display.say("STEP", "$ %s" % display_message)
-    code, result, err = os_call("%s %s" % (cmd, command.split(" ", 1)[1]))
+    params = ""
+    try:
+        params = command.split(" ", 1)[1]
+    except:  # noqa # nosec
+        pass
+    code, result, err = os_call("%s %s" % (cmd, params))
     result = result.strip().replace("\n", "\n".ljust(display.cmdbarwidth + 1) + "| ")
     err = err.strip().replace("\n", "\n".ljust(display.cmdbarwidth + 1) + "| ")
     if len(result) > 0:

hooks4git/tools.py

@@ -18,14 +18,24 @@ def os_call(command):
     """
     Run system command.
     """
+    command = command.strip()
     result_out = ""
     result_err = ""
     returncode = -1
     try:
         pipe1 = subprocess.PIPE
         pipe2 = subprocess.PIPE
-        bash = None if "Windows" in get_platform() else "/bin/bash"
-        proc = subprocess.Popen(command, stdout=pipe1, stderr=pipe2, shell=True, executable=bash)  # noqa # nosec
+        bash = "/bin/bash"
+        shell = True
+
+        if "Windows" in get_platform():
+            bash = None
+            shell = False
+            if "h4g" in command:
+                command = "/" + command[0].lower() + command[2:].replace(":\\", "/").replace("\\", "/")  # noqa
+                command = 'c:\\Program Files\\Git\\bin\\bash.exe -c "' + command + '"'  # noqa
+
+        proc = subprocess.Popen(command, stdout=pipe1, stderr=pipe2, shell=shell, executable=bash)  # noqa # nosec
         out, err = proc.communicate()
         try:
             tmp_out = out.decode("utf-8")