From f3ae45b7bd5e1799688d94d53847ec495c034338 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Fri, 21 Jun 2024 21:52:13 +1000 Subject: [PATCH] Fix Git hooks failing when `pwsh` and `dotnet` are missing from `PATH` forgot `set -e` applies to subshells --- Dist/git_hook_shim.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dist/git_hook_shim.sh b/Dist/git_hook_shim.sh index 6ad95f267d..2bf8fbe6fb 100755 --- a/Dist/git_hook_shim.sh +++ b/Dist/git_hook_shim.sh @@ -1,8 +1,7 @@ #!/bin/sh -set -e pwsh="$(command -v pwsh)" if [ -z "$pwsh" ]; then pwsh="$(command -v dotnet) pwsh"; fi if ! ("$pwsh" -v >/dev/null 2>/dev/null); then exit 0; fi kind="$(basename "$0")" -"$pwsh" "./Dist/git_hooks/$kind.ps1" "$@" -if [ -e "./Dist/git_hooks/$kind.local.ps1" ]; then "$pwsh" "./Dist/git_hooks/$kind.local.ps1" "$@"; fi +"$pwsh" "./Dist/git_hooks/$kind.ps1" "$@" || exit $? +if [ -e "./Dist/git_hooks/$kind.local.ps1" ]; then "$pwsh" "./Dist/git_hooks/$kind.local.ps1" "$@" || exit $?; fi