Commit8daa4e9

committed

pgindent: fix downloading of BSD indent binary

Also fix accessing pgentab binary and tar.Gurjeet Singh

1 parentf8a54e9 commit8daa4e9Copy full SHA for 8daa4e9

File tree

-10

lines changed

-10

lines changed

Lines changed: 9 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ my $filtered_typedefs_fh;`
`59`	`59`
`60`	`60`	`subcheck_indent`
`61`	`61`	`{`
`62`		`-system("entab <$devnull");`
	`62`	`+system("$entab <$devnull");`
`63`	`63`	`if ($?)`
`64`	`64`	`{`
`65`	`65`	`printSTDERR`
`@@ -448,29 +448,28 @@ sub run_build`
`448`	`448`
`449`	`449`	`$ENV{PGTYPEDEFS} = abs_path('tmp_typedefs.list');`
`450`	`450`
	`451`	`+my$pg_bsd_indent_name ="pg_bsd_indent-" .$INDENT_VERSION .".tar.gz";`
	`452`	`+`
`451`	`453`	`$rv =`
`452`		`- getstore("ftp://ftp.postgresql.org/pub/dev/indent.netbsd.patched.tgz",`
`453`		`-"indent.netbsd.patched.tgz");`
	`454`	`+ getstore("ftp://ftp.postgresql.org/pub/dev/$pg_bsd_indent_name",`
	`455`	`+"pg_bsd_indent.tgz");`
`454`	`456`
`455`		`-die"fetchingindent.netbsd.patched.tgz"unless is_success($rv);`
	`457`	`+die"fetching$pg_bsd_indent_name"unless is_success($rv);`
`456`	`458`
`457`	`459`	`# XXX add error checking here`
`458`	`460`
`459`		`-mkdir"bsdindent";`
`460`		`-chdir"bsdindent";`
`461`		`-system("tar -z -xf ../indent.netbsd.patched.tgz");`
	`461`	`+system("tar -z -xf pg_bsd_indent.tgz");`
	`462`	`+chdir"pg_bsd_indent";`
`462`	`463`	`system("make >$devnull 2>&1");`
`463`	`464`
`464`		`-$ENV{PGINDENT} = abs_path('indent');`
	`465`	`+$ENV{PGINDENT} = abs_path('pg_bsd_indent');`
`465`	`466`
`466`	`467`	`chdir"../../entab";`
`467`		`-`
`468`	`468`	`system("make >$devnull 2>&1");`
`469`	`469`
`470`	`470`	`$ENV{PGENTAB} = abs_path('entab');`
`471`	`471`
`472`	`472`	`chdir$save_dir;`
`473`		`-`
`474`	`473`	`}`
`475`	`474`
`476`	`475`

Comments

(0)