Fix lefthook binary extension on Windows

evilmartians · May 15, 2021 · d0e8d2e · d0e8d2e
1 parent ecc4670
commit d0e8d2e
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 20 deletions.
diff --git a/cmd/templates.go b/cmd/templates.go
@@ -4,6 +4,7 @@ import (
  "bytes"
  "embed"
  "text/template"
+ "runtime"
 
  "github.com/spf13/afero"
 )
@@ -14,6 +15,7 @@ var templatesFS embed.FS
 type hookTmplData struct {
  AutoInstall string
  HookName string
+ Extension string
 }
 
 func hookTemplate(hookName string, fs afero.Fs) []byte {
@@ -22,6 +24,7 @@ func hookTemplate(hookName string, fs afero.Fs) []byte {
  err := t.Execute(buf, hookTmplData{
  AutoInstall: autoInstall(hookName, fs),
  HookName: hookName,
+ Extension: getExtension(),
  })
  check(err)
 
@@ -40,5 +43,13 @@ func autoInstall(hookName string, fs afero.Fs) string {
  return ""
  }
 
- return "# lefthook_version: " + configChecksum(fs) + "\n\ncall_lefthook \"lefthook install\""
+ return "# lefthook_version: " + configChecksum(fs) + "\n\ncall_lefthook \"install\""
+}
+
+func getExtension() string {
+ if (runtime.GOOS == "windows") {
+ return ".exe"
+ } else {
+ return ""
+ }
 }
diff --git a/cmd/templates/hook.tmpl b/cmd/templates/hook.tmpl
@@ -14,24 +14,24 @@ call_lefthook()
 {
  if lefthook -h >/dev/null 2>&1
  then
- eval $1
- elif test -f "$dir/node_modules/@arkweid/lefthook/bin/lefthook"
+ eval lefthook $1
+ elif test -f "$dir/node_modules/@arkweid/lefthook/bin/lefthook{{.Extension}}"
  then
- eval $dir/node_modules/@arkweid/lefthook/bin/$1
+ eval "$dir/node_modules/@arkweid/lefthook/bin/lefthook{{.Extension}} $1"
  elif bundle exec lefthook -h >/dev/null 2>&1
  then
- bundle exec $1
+ bundle exec lefthook $1
  elif npx lefthook -h >/dev/null 2>&1
  then
- npx $1
+ npx lefthook $1
  elif yarn lefthook -h >/dev/null 2>&1
  then
- yarn $1
+ yarn lefthook $1
  else
  echo "Can't find lefthook in PATH"
  fi
 }
 
 {{.AutoInstall}}
 
-call_lefthook "lefthook run {{.HookName}} $@"
+call_lefthook "run {{.HookName}} $@"
diff --git a/spec/fixtures/pre-commit b/spec/fixtures/pre-commit
@@ -14,24 +14,24 @@ call_lefthook()
 {
  if lefthook -h >/dev/null 2>&1
  then
- eval $1
+ eval lefthook $1
  elif test -f "$dir/node_modules/@arkweid/lefthook/bin/lefthook"
  then
- eval $dir/node_modules/@arkweid/lefthook/bin/$1
+ eval "$dir/node_modules/@arkweid/lefthook/bin/lefthook $1"
  elif bundle exec lefthook -h >/dev/null 2>&1
  then
- bundle exec $1
+ bundle exec lefthook $1
  elif npx lefthook -h >/dev/null 2>&1
  then
- npx $1
+ npx lefthook $1
  elif yarn lefthook -h >/dev/null 2>&1
  then
- yarn $1
+ yarn lefthook $1
  else
  echo "Can't find lefthook in PATH"
  fi
 }
 
 
 
-call_lefthook "lefthook run pre-commit $@"
+call_lefthook "run pre-commit $@"
diff --git a/spec/fixtures/pre-push b/spec/fixtures/pre-push
@@ -14,24 +14,24 @@ call_lefthook()
 {
  if lefthook -h >/dev/null 2>&1
  then
- eval $1
+ eval lefthook $1
  elif test -f "$dir/node_modules/@arkweid/lefthook/bin/lefthook"
  then
- eval $dir/node_modules/@arkweid/lefthook/bin/$1
+ eval "$dir/node_modules/@arkweid/lefthook/bin/lefthook $1"
  elif bundle exec lefthook -h >/dev/null 2>&1
  then
- bundle exec $1
+ bundle exec lefthook $1
  elif npx lefthook -h >/dev/null 2>&1
  then
- npx $1
+ npx lefthook $1
  elif yarn lefthook -h >/dev/null 2>&1
  then
- yarn $1
+ yarn lefthook $1
  else
  echo "Can't find lefthook in PATH"
  fi
 }
 
 
 
-call_lefthook "lefthook run pre-push $@"
+call_lefthook "run pre-push $@"