From 6faf495b8a63cd8876e37f2f06786387bbe3c2cb Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 14 Jan 2009 21:59:19 +0000
Subject: [PATCH] Make 'find' syntax consistent;  add .git exclusion to
 make_ctags.

---
 src/tools/make_ctags | 13 +++++++------
 src/tools/make_etags | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/tools/make_ctags b/src/tools/make_ctags
index 4deb97f3a8..18d96db5b8 100755
--- a/src/tools/make_ctags
+++ b/src/tools/make_ctags
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $PostgreSQL: pgsql/src/tools/make_ctags,v 1.11 2006/03/11 04:38:41 momjian Exp $
+# $PostgreSQL: pgsql/src/tools/make_ctags,v 1.12 2009/01/14 21:59:19 momjian Exp $
 
 trap "rm -f /tmp/$$" 0 1 2 3 15
 rm -f ./tags
@@ -12,8 +12,9 @@ then	FLAGS="-dt"
 else	FLAGS="--c-types=+dfmstuv"
 fi
 
-find `pwd`/ \( -name _deadcode -a -prune \) -o \
-	-type f -name '*.[chyl]' -print|xargs ctags "$FLAGS" -a -f tags
+find `pwd`/ \( -name _deadcode -prune \) -o \
+		-type f -name '*.[chyl]' -print |
+	xargs ctags "$FLAGS" -a -f tags
 
 if [ -z "$cv" ]
 then
@@ -22,7 +23,7 @@ then
 	sort tags >/tmp/$$ && mv /tmp/$$ tags
 fi
 
-find . -name  'CVS' -prune -o -type d -print  |while read DIR
-do
-	[ "$DIR" != "." ] && ln -f -s `echo "$DIR" | sed 's;/[^/]*;/..;g'`/tags $DIR/tags
+find . \( -name 'CVS' -prune \) -o \( -name .git -prune \) -o -type d -print |
+while read DIR
+do	[ "$DIR" != "." ] && ln -f -s `echo "$DIR" | sed 's;/[^/]*;/..;g'`/tags "$DIR"/tags
 done
diff --git a/src/tools/make_etags b/src/tools/make_etags
index 612c97f1e9..6acb0df0de 100755
--- a/src/tools/make_etags
+++ b/src/tools/make_etags
@@ -1,12 +1,13 @@
 #!/bin/sh
 
-# $PostgreSQL: pgsql/src/tools/make_etags,v 1.5 2009/01/14 21:28:32 petere Exp $
+# $PostgreSQL: pgsql/src/tools/make_etags,v 1.6 2009/01/14 21:59:19 momjian Exp $
 
 rm -f ./TAGS
-find `pwd`/ -type f -name '*.[chyl]' -print | \
-  xargs etags --append -o TAGS
 
-find . -type d \( -name CVS -o -name .git -prune -o -print \) | \
-while read DIR; do
-  [ "$DIR" != "." ] && ln -f -s `pwd`/TAGS $DIR
+find `pwd`/ -type f -name '*.[chyl]' -print |
+	xargs etags --append -o TAGS
+
+find . \( -name CVS -prune \) -o \( -name .git -prune \) -o -type d -print |
+while read DIR
+do	[ "$DIR" != "." ] && ln -f -s `pwd`/TAGS "$DIR"
 done