More robust post-commit hook #59

Author: mschenk42

project/project.go

@@ -34,7 +34,7 @@ var (
 		"post-commit": {
 			Exe:     "gtm",
 			Command: "gtm commit --yes",
-			RE:      regexp.MustCompile(`(?s)[/,\\,:,a-z,A-Z,0-9,$,-,_,=,(,),",., ]*gtm(.exe"|)\s+commit\s+--yes\.*`)},
+			RE:      regexp.MustCompile(`(?s)[/:a-zA-Z0-9$_=()"\.\|\-\\ ]*gtm(.exe"|)\s+commit\s+--yes\.*`)},
 	}
 	// GitConfig is map of git configuration settings
 	GitConfig = map[string]string{

scm/git.go

@@ -581,9 +581,9 @@ func (g GitHook) getCommandPath() string {
 	}
 	if runtime.GOOS == "windows" {
 		// put "" around file path
-		return strings.Replace(g.Command, g.Exe, fmt.Sprintf("\"%s\"", p), 1)
+		return strings.Replace(g.Command, g.Exe, fmt.Sprintf("%s || \"%s\"", g.Command, p), 1)
 	}
-	return strings.Replace(g.Command, g.Exe, p, 1)
+	return strings.Replace(g.Command, g.Exe, fmt.Sprintf("%s || %s", g.Command, p), 1)
 }
 
 func (g GitHook) getExeForOS() string {