From 6d00ae26ae0dec8530afcb74fccbf3f80de91d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ana=20Mar=C3=ADa=20Mart=C3=ADnez=20G=C3=B3mez?= Date: Wed, 29 Jul 2020 09:55:06 +0200 Subject: [PATCH] hooks: do not repeat #!/usr/bin/env bash The comment claims that: > doesn't matter if `#!/usr/bin/env bash` gets repeated later on in a hooks file However it is a convetion that there is only one comment like that and the `setup-hooks.sh` script already takes care of adding it if the file didn't exist. Alternatively, we could leave the extra comment and remove the related code in `setup-hooks.sh`. Currently two comments are added even if the file didn't exist. --- scripts/hooks/post-commit | 3 --- scripts/hooks/pre-push | 3 --- scripts/setup-hooks.sh | 4 ++-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/scripts/hooks/post-commit b/scripts/hooks/post-commit index c411d8ad..b8d0892f 100755 --- a/scripts/hooks/post-commit +++ b/scripts/hooks/post-commit @@ -1,4 +1,3 @@ -#!/usr/bin/env bash # Copyright (C) 2020 FireEye, Inc. All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -6,8 +5,6 @@ # Unless required by applicable law or agreed to in writing, software distributed under the License # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and limitations under the License. -# -# doesn't matter if this gets repeated later on in a hooks file # Use a console with emojis support for a better experience diff --git a/scripts/hooks/pre-push b/scripts/hooks/pre-push index f25aca57..51e3830b 100755 --- a/scripts/hooks/pre-push +++ b/scripts/hooks/pre-push @@ -1,4 +1,3 @@ -#!/usr/bin/env bash # Copyright (C) 2020 FireEye, Inc. All Rights Reserved. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -6,8 +5,6 @@ # Unless required by applicable law or agreed to in writing, software distributed under the License # is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and limitations under the License. -# -# doesn't matter if this gets repeated later on in a hooks file # Use a console with emojis support for a better experience diff --git a/scripts/setup-hooks.sh b/scripts/setup-hooks.sh index 5dae6148..ce0acc6f 100755 --- a/scripts/setup-hooks.sh +++ b/scripts/setup-hooks.sh @@ -13,11 +13,11 @@ GIT_DIR=$(git rev-parse --show-toplevel); cd "$GIT_DIR"; # hooks may exist already (e.g. git-lfs configuration) -# If the `.git/hooks/$arg` file doesn't exist it, initialize with `#!/bin/sh` +# If the `.git/hooks/$arg` file doesn't exist it, initialize with `#!/usr/bin/env bash` # After that append `scripts/hooks/$arg` and ensure they can be run create_hook() { if [[ ! -e .git/hooks/$1 ]]; then - echo "#!/bin/sh" > ".git/hooks/$1"; + echo "#!/usr/bin/env bash" > ".git/hooks/$1"; fi cat scripts/hooks/"$1" >> ".git/hooks/$1"; chmod +x .git/hooks/"$1";