Return ASAP from checkClientOutputBufferLimits() if c->reply_bytes is zero.

[redis.git] / utils / install_server.sh

diff --git a/utils/install_server.sh b/utils/install_server.sh
index eed1e2513bc40fc5bed69f60e7ad28f57cce1db2..eedd80342fac78b333e8bf1ee658a78263947ae0 100755 (executable)
--- a/utils/install_server.sh
+++ b/utils/install_server.sh
@@ -47,7 +47,7 @@ echo "This script will help you easily set up a running redis server
 
 #check for root user TODO: replace this with a call to "id"
 if [ `whoami` != "root" ] ; then
 
 #check for root user TODO: replace this with a call to "id"
 if [ `whoami` != "root" ] ; then

-       echo "ERROR: You must run this installation script as root. Sorry!\n"
+       echo "You must run this script as root. Sorry!"

        exit 1
 fi
 
        exit 1
 fi
 


@@ -99,11 +99,15 @@ if [ ! -f "$REDIS_EXECUTABLE" ] ; then
        
 fi
 
        
 fi
 

+

 #render the tmplates
 TMP_FILE="/tmp/$REDIS_PORT.conf"
 TPL_FILE="./redis.conf.tpl"
 INIT_TPL_FILE="./redis_init_script.tpl"
 INIT_SCRIPT_DEST="/etc/init.d/redis_$REDIS_PORT"
 #render the tmplates
 TMP_FILE="/tmp/$REDIS_PORT.conf"
 TPL_FILE="./redis.conf.tpl"
 INIT_TPL_FILE="./redis_init_script.tpl"
 INIT_SCRIPT_DEST="/etc/init.d/redis_$REDIS_PORT"

+PIDFILE="/var/run/redis_$REDIS_PORT.pid"
+
+

 
 #check the default for redis cli
 CLI_EXEC=`which redis-cli`
 
 #check the default for redis cli
 CLI_EXEC=`which redis-cli`


@@ -126,8 +130,9 @@ REDIS_INIT_HEADER=\
 #Configurations injected by install_server below....\n\n
 EXEC=$REDIS_EXECUTABLE\n
 CLIEXEC=$CLI_EXEC\n
 #Configurations injected by install_server below....\n\n
 EXEC=$REDIS_EXECUTABLE\n
 CLIEXEC=$CLI_EXEC\n

-PIDFILE=/var/run/redis_${REDIS_PORT}.pid\n
+PIDFILE=$PIDFILE\n

 CONF=\"$REDIS_CONFIG_FILE\"\n\n
 CONF=\"$REDIS_CONFIG_FILE\"\n\n

+REDISPORT=\"$REDIS_PORT\"\n\n

 ###############\n\n"
 
 #combine the header and the template (which is actually a static footer)
 ###############\n\n"
 
 #combine the header and the template (which is actually a static footer)