Commit6809c06

committed

Be consistent about not using ECHO_N/ECHO_C (seems unnecessary on Linux).

1 parentd0b5444 commit6809c06Copy full SHA for 6809c06

File tree

-11

lines changed

-11

lines changed

Lines changed: 2 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`
`25`	`25`	`# Original author: Ryan Kirkpatrick <pgsql@rkirkpat.net>`
`26`	`26`
`27`		`-# $PostgreSQL: pgsql/contrib/start-scripts/linux,v 1.7 2004/10/01 18:30:21 tgl Exp $`
	`27`	`+# $PostgreSQL: pgsql/contrib/start-scripts/linux,v 1.8 2006/07/13 14:44:33 petere Exp $`
`28`	`28`
`29`	`29`	`## EDIT FROM HERE`
`30`	`30`
`@@ -42,15 +42,6 @@ PGLOG="$PGDATA/serverlog"`
`42`	`42`
`43`	`43`	`## STOP EDITING HERE`
`44`	`44`
`45`		`-# Check for echo -n vs echo \c`
`46`		`-ifecho'\c'\| grep -s c>/dev/null2>&1;then`
`47`		`- ECHO_N="echo -n"`
`48`		`- ECHO_C=""`
`49`		`-else`
`50`		`- ECHO_N="echo"`
`51`		`- ECHO_C='\c'`
`52`		`-fi`
`53`		`-`
`54`	`45`	`# The path that is to be used for the script`
`55`	`46`	`PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin`
`56`	`47`
`@@ -70,7 +61,7 @@ test -x $DAEMON \|\| exit 0`
`70`	`61`	`# Parse command line parameters.`
`71`	`62`	`case$1in`
`72`	`63`	`start)`
`73`		`-$ECHO_N"Starting PostgreSQL:"$ECHO_C`
	`64`	`+echo -n"Starting PostgreSQL:"`
`74`	`65`	`su -$PGUSER -c"$DAEMON -D '$PGDATA' &">>$PGLOG2>&1`
`75`	`66`	`echo"ok"`
`76`	`67`	`;;`

Comments

(0)