Skip to content

Commit

Permalink
Merge pull request #98 from mabaritw/master
Browse files Browse the repository at this point in the history
updated current flags to support pflag
  • Loading branch information
mabaritw authored Feb 5, 2019
2 parents 8bb5717 + e8b8d87 commit 270df85
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-hooks.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- id: talisman-commit
name: talisman
entry: talisman -githook pre-commit
entry: talisman --githook pre-commit
stages: [commit]
# talisman currently discovers files by itself and does not take them on the cli
pass_filenames: false
Expand All @@ -9,7 +9,7 @@

- id: talisman-push
name: talisman
entry: talisman -githook pre-push
entry: talisman --githook pre-push
stages: [push]
# talisman currently discovers files by itself and does not take them on the cli
pass_filenames: false
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ In order to use husky, make sure you have already set TALISMAN_HOME to `$PATH`.
###### Windows

```
"bash -c '\"%TALISMAN_HOME%\\${TALISMAN_BINARY_NAME}\" -githook pre-commit'"
"bash -c '\"%TALISMAN_HOME%\\${TALISMAN_BINARY_NAME}\" --githook pre-commit'"
```

###### Linux/Unix
Expand All @@ -130,7 +130,7 @@ In order to use husky, make sure you have already set TALISMAN_HOME to `$PATH`.
{
"husky": {
"hooks": {
"pre-commit": "bash -c '\"%TALISMAN_HOME%\\${TALISMAN_BINARY_NAME}\" -githook pre-commit'" && "other-scripts"
"pre-commit": "bash -c '\"%TALISMAN_HOME%\\${TALISMAN_BINARY_NAME}\" --githook pre-commit'" && "other-scripts"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion global_install_scripts/install.bash
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ function run() {
echo_error "that couldn't automatically be hooked up with talisman as ${HOOK_SCRIPT}"
echo_error "If you are already using husky for git hooks (https://github.com/typicode/husky)"
echo_error "Add the following script to husky pre-commit in your package.json for the repositories listed ${EXCEPTIONS_FILE_HOME_PATH}"
echo "\"bash -c '\"%TALISMAN_HOME%\\${TALISMAN_BINARY_NAME}\" -githook pre-commit'\""
echo "\"bash -c '\"%TALISMAN_HOME%\\${TALISMAN_BINARY_NAME}\" --githook pre-commit'\""

else
EXCEPTIONS_FILE_HOME_PATH="${HOME}/talisman_missed_repositories.paths"
Expand Down
2 changes: 1 addition & 1 deletion global_install_scripts/talisman_hook_script.bash
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fi

DEBUG_OPTS=""
[[ -n "${TALISMAN_DEBUG}" ]] && DEBUG_OPTS="-d"
CMD="${TALISMAN_BINARY} ${DEBUG_OPTS} -githook ${HOOKNAME}"
CMD="${TALISMAN_BINARY} ${DEBUG_OPTS} --githook ${HOOKNAME}"
echo_debug "ARGS are $@"
echo_debug "Executing: ${CMD}"
${CMD}

0 comments on commit 270df85

Please sign in to comment.