From: Peter Eisentraut <peter_e@gmx.net>
Date: Thu, 13 Jul 2006 14:44:33 +0000 (+0000)
Subject: Be consistent about not using ECHO_N/ECHO_C (seems unnecessary on Linux).
X-Git-Tag: REL8_2_BETA1~579
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6809c064d727952310a0e735d1f5658f15873f1b;p=postgresql

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

diff --git a/contrib/start-scripts/linux b/contrib/start-scripts/linux
index e0174de571..f1feb34f94 100644
--- a/contrib/start-scripts/linux
+++ b/contrib/start-scripts/linux
@@ -24,7 +24,7 @@
 
 # Original author:  Ryan Kirkpatrick <pgsql@rkirkpat.net>
 
-# $PostgreSQL: pgsql/contrib/start-scripts/linux,v 1.7 2004/10/01 18:30:21 tgl Exp $
+# $PostgreSQL: pgsql/contrib/start-scripts/linux,v 1.8 2006/07/13 14:44:33 petere Exp $
 
 ## EDIT FROM HERE
 
@@ -42,15 +42,6 @@ PGLOG="$PGDATA/serverlog"
 
 ## STOP EDITING HERE
 
-# Check for echo -n vs echo \c
-if echo '\c' | grep -s c >/dev/null 2>&1 ; then
-    ECHO_N="echo -n"
-    ECHO_C=""
-else
-    ECHO_N="echo"
-    ECHO_C='\c'
-fi
-
 # The path that is to be used for the script
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
@@ -70,7 +61,7 @@ test -x $DAEMON || exit 0
 # Parse command line parameters.
 case $1 in
   start)
-	$ECHO_N "Starting PostgreSQL: "$ECHO_C
+	echo -n "Starting PostgreSQL: "
 	su - $PGUSER -c "$DAEMON -D '$PGDATA' &" >>$PGLOG 2>&1
 	echo "ok"
 	;;