Commitc4d1243

committed

Use $INDENT rather than indent throughout the pgindent code

This allows the user to change the path to be used more easily.Also, change URL in README.

1 parent52b6053 commitc4d1243Copy full SHA for c4d1243

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ This can format all PostgreSQL .c and .h files, but excludes *.y, and`
`10`	`10`
`11`	`11`	`2) Download the typedef file from the buildfarm:`
`12`	`12`
`13`		`-wget -O src/tools/pgindent/typedefs.list http://www.pgbuildfarm.org/cgi-bin/typedefs.pl`
	`13`	`+wget -O src/tools/pgindent/typedefs.list http://buildfarm.postgresql.org/cgi-bin/typedefs.pl`
`14`	`14`
`15`	`15`	`3) Remove all derived files (pgindent has trouble with one of the flex macros):`
`16`	`16`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ fi`
`21`	`21`	`TYPEDEFS="$1"`
`22`	`22`	`shift`
`23`	`23`
	`24`	+INDENT=`which indent`
	`25`	`+`
`24`	`26`	`trap"rm -f /tmp/$$ /tmp/$$a" 0 1 2 3 15`
`25`	`27`	`entab</dev/null>/dev/null`
`26`	`28`	`if ["$?"-ne 0 ]`
`@@ -29,12 +31,12 @@ thenecho "Go to the src/tools/entab directory and do a 'make' and 'make install`
`29`	`31`	`echo"Then run$0 again."`
`30`	`32`	`exit 1`
`31`	`33`	`fi`
`32`		`-indent -?</dev/null>/dev/null2>&1`
	`34`	`+$INDENT -?</dev/null>/dev/null2>&1`
`33`	`35`	`if ["$?"-ne 1 ]`
`34`	`36`	`thenecho"You do not appear to have 'indent' installed on your system.">&2`
`35`	`37`	`exit 1`
`36`	`38`	`fi`
`37`		`-indent -gnu</dev/null>/dev/null2>&1`
	`39`	`+$INDENT -gnu</dev/null>/dev/null2>&1`
`38`	`40`	`if ["$?"-eq 0 ]`
`39`	`41`	`thenecho"You appear to have GNU indent rather than BSD indent.">&2`
`40`	`42`	`echo"See the pgindent/README file for a description of its problems.">&2`
`@@ -136,7 +138,7 @@ do`
`136`	`138`	`sed's;^CATALOG(.$;/&*/;'>/tmp/$$a`
`137`	`139`
`138`	`140`	`# We get the list of typedef's from /src/tools/find_typedef`
`139`		`-indent -bad -bap -bc -bl -d0 -cdb -nce -nfc1 -di12 -i4 -l79 \`
	`141`	`+$INDENT -bad -bap -bc -bl -d0 -cdb -nce -nfc1 -di12 -i4 -l79 \`
`140`	`142`	`-lp -nip -npro -bbb$EXTRA_OPTS \`
`141`	`143`	`egrep -v'^(FD_SET\|date\|interval\|timestamp\|ANY)$'"$TYPEDEFS"\| sed -e'/^$/d' -e's/.*/-T& /'` \
`142`	`144`	`/tmp/$$a>/tmp/$$2>&1`

Comments

(0)