From 4ef0a6b3571497e62aa002aa372cdd794cd2059a Mon Sep 17 00:00:00 2001
From: Petr Baudis <pasky@suse.cz>
Date: Sun, 3 Aug 2008 16:28:41 +0200
Subject: [PATCH] tg.sh: setup_hook(): Test existence instead of -x

Also, be more set -e friendly in boolean lists.
---
 tg.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tg.sh b/tg.sh
index c334f70..e27ff30 100644
--- a/tg.sh
+++ b/tg.sh
@@ -21,11 +21,10 @@ die()
 setup_hook()
 {
 	hook_call="\"\$(tg --hooks-path)\"/$1 \"\$@\""
-	if [ -x "$git_dir/hooks/$1" ]; then
-		if fgrep -q "$hook_call" "$git_dir/hooks/$1"; then
-			# Another job well done!
-			return
-		fi
+	if [ -f "$git_dir/hooks/$1" ] &&
+	   fgrep -q "$hook_call" "$git_dir/hooks/$1"; then
+		# Another job well done!
+		return
 	fi
 	# Prepare incanation
 	if [ -x "$git_dir/hooks/$1" ]; then
@@ -37,7 +36,7 @@ setup_hook()
 	{
 		echo "#!/bin/sh"
 		echo "$hook_call"
-		[ -x "$git_dir/hooks/$1" ] && cat "$git_dir/hooks/$1"
+		[ ! -s "$git_dir/hooks/$1" ] || cat "$git_dir/hooks/$1"
 	} >"$git_dir/hooks/$1+"
 	chmod a+x "$git_dir/hooks/$1+"
 	mv "$git_dir/hooks/$1+" "$git_dir/hooks/$1"
-- 
2.30.2