Merge pull request #27 from Arkweid/move-lefthook-skip-on-top

Move lefthook skip on top

cmd/add.go

@@ -62,9 +62,15 @@ func addHook(hookName string, fs afero.Fs) {
 		return
 	}
 	// TODO: text/template
-	template := "#!/bin/bash\n" + autoInstall(hookName, fs) + "\n" +
-		"cmd=\"lefthook run " + hookName + " $@\"" +
+	template := `
+#!/bin/sh
+
+if [ "{$LEFTHOOK}" = "0" ]; then
+	exit 0
+fi
+` + autoInstall(hookName, fs) + "\n" + "cmd=\"lefthook run " + hookName + " $@\"" +
 		`
+
 if lefthook >/dev/null 2>&1
 then
   exec $cmd
@@ -102,9 +108,10 @@ fi
 
 func autoInstall(hookName string, fs afero.Fs) string {
 	if hookName == checkSumHook {
-		return "# lefthook_version: " + configChecksum(fs) + "\n" +
+		return "\n# lefthook_version: " + configChecksum(fs) + "\n\n" +
 			"cmd=\"lefthook install\"" +
 			`
+
 if lefthook >/dev/null 2>&1
 then
 	exec $cmd

cmd/install.go

@@ -36,6 +36,7 @@ var availableHooks = [...]string{
 }
 
 var checkSumHook = "prepare-commit-msg"
+var force bool
 
 var installCmd = &cobra.Command{
 	Use:   "install",
@@ -48,13 +49,14 @@ var installCmd = &cobra.Command{
 var appFs = afero.NewOsFs()
 
 func init() {
+	rootCmd.PersistentFlags().BoolVarP(&force, "force", "f", false, "reinstall hooks without checking config version")
 	rootCmd.AddCommand(installCmd)
 }
 
 // InstallCmdExecutor execute basic configuration
 func InstallCmdExecutor(args []string, fs afero.Fs) {
 	if yes, _ := afero.Exists(fs, getConfigYamlPath()); yes {
-		if !isConfigSync(fs) {
+		if !isConfigSync(fs) || force {
 			log.Println(au.Cyan("SYNCING"), au.Bold("lefthook.yml"))
 			DeleteGitHooks(fs)
 			AddGitHooks(fs)