Commit 6809c064 authored by Peter Eisentraut's avatar Peter Eisentraut

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

parent d0b54441
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# Original author: Ryan Kirkpatrick <pgsql@rkirkpat.net> # 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 ## EDIT FROM HERE
...@@ -42,15 +42,6 @@ PGLOG="$PGDATA/serverlog" ...@@ -42,15 +42,6 @@ PGLOG="$PGDATA/serverlog"
## STOP EDITING HERE ## 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 # The path that is to be used for the script
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
...@@ -70,7 +61,7 @@ test -x $DAEMON || exit 0 ...@@ -70,7 +61,7 @@ test -x $DAEMON || exit 0
# Parse command line parameters. # Parse command line parameters.
case $1 in case $1 in
start) start)
$ECHO_N "Starting PostgreSQL: "$ECHO_C echo -n "Starting PostgreSQL: "
su - $PGUSER -c "$DAEMON -D '$PGDATA' &" >>$PGLOG 2>&1 su - $PGUSER -c "$DAEMON -D '$PGDATA' &" >>$PGLOG 2>&1
echo "ok" echo "ok"
;; ;;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment