Skip to content
This repository

fix some typos #862

Open
wants to merge 4 commits into from

1 participant

caoxudong
caoxudong

hi antirez,

I fix some typos in 00-RELEASENOTE.

Best Regards.

  • caoxudong
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 4 unique commits by 2 authors.

Jan 06, 2013
fix some typos a7cf183
Jan 07, 2013
caoxudong Add some spaces after '!' in 'if' condition, or customized configurat…
…ion will be ignored.
96c45ec
caoxudong Add some spaces after '!' in 'if' condition, or customized configurat…
…ion will be ignored.
aaa9157
Jan 11, 2013
modify DEFAULT_CONFIG and INIT_TPL_FILE to enable executing install-s…
…erver.sh anywhere
b064dfc
This page is out of date. Refresh to see the latest.
4  00-RELEASENOTES
@@ -26,7 +26,7 @@ Also the following redis.conf and CONFIG GET / SET parameters changed name:
26 26
 
27 27
     * hash-max-zipmap-entries, now replaced by hash-max-ziplist-entries
28 28
     * hash-max-zipmap-value, now replaced by hash-max-ziplist-value
29  
-    * glueoutputbuf was no completely removed as it does not make sense
  29
+    * glueoutputbuf was now completely removed as it does not make sense
30 30
 
31 31
 ---------
32 32
 CHANGELOG
@@ -46,7 +46,7 @@ UPGRADE URGENCY: We suggest new users to start with 2.6.0, and old users to
46 46
   in slaves.
47 47
 * Milliseconds resolution expires, also added new commands with milliseconds
48 48
   precision (PEXPIRE, PTTL, ...).
49  
-* Clinets max output buffer soft and hard limits. You can specifiy different
  49
+* Clients max output buffer soft and hard limits. You can specifiy different
50 50
   limits for different classes of clients (normal,pubsub,slave).
51 51
 * AOF is now able to rewrite aggregate data types using variadic commands,
52 52
   often producing an AOF that is faster to save, load, and is smaller in size.
16  utils/install_server.sh
@@ -59,7 +59,7 @@ fi
59 59
 #read the redis config file
60 60
 _REDIS_CONFIG_FILE="/etc/redis/$REDIS_PORT.conf"
61 61
 read -p "Please select the redis config file name [$_REDIS_CONFIG_FILE] " REDIS_CONFIG_FILE
62  
-if [ !"$REDIS_CONFIG_FILE" ] ; then
  62
+if [ ! "$REDIS_CONFIG_FILE" ] ; then
63 63
 	REDIS_CONFIG_FILE=$_REDIS_CONFIG_FILE
64 64
 	echo "Selected default - $REDIS_CONFIG_FILE"
65 65
 fi
@@ -69,7 +69,7 @@ mkdir -p `dirname "$REDIS_CONFIG_FILE"` || die "Could not create redis config di
69 69
 #read the redis log file path
70 70
 _REDIS_LOG_FILE="/var/log/redis_$REDIS_PORT.log"
71 71
 read -p "Please select the redis log file name [$_REDIS_LOG_FILE] " REDIS_LOG_FILE
72  
-if [ !"$REDIS_LOG_FILE" ] ; then
  72
+if [ ! "$REDIS_LOG_FILE" ] ; then
73 73
 	REDIS_LOG_FILE=$_REDIS_LOG_FILE
74 74
 	echo "Selected default - $REDIS_LOG_FILE"
75 75
 fi
@@ -78,7 +78,7 @@ fi
78 78
 #get the redis data directory
79 79
 _REDIS_DATA_DIR="/var/lib/redis/$REDIS_PORT"
80 80
 read -p "Please select the data directory for this instance [$_REDIS_DATA_DIR] " REDIS_DATA_DIR
81  
-if [ !"$REDIS_DATA_DIR" ] ; then
  81
+if [ ! "$REDIS_DATA_DIR" ] ; then
82 82
 	REDIS_DATA_DIR=$_REDIS_DATA_DIR
83 83
 	echo "Selected default - $REDIS_DATA_DIR"
84 84
 fi
@@ -100,8 +100,8 @@ fi
100 100
 
101 101
 #render the tmplates
102 102
 TMP_FILE="/tmp/$REDIS_PORT.conf"
103  
-DEFAULT_CONFIG="../redis.conf"
104  
-INIT_TPL_FILE="./redis_init_script.tpl"
  103
+DEFAULT_CONFIG="`dirname $0`/../redis.conf"
  104
+INIT_TPL_FILE="`dirname $0`/./redis_init_script.tpl"
105 105
 INIT_SCRIPT_DEST="/etc/init.d/redis_$REDIS_PORT"
106 106
 PIDFILE="/var/run/redis_$REDIS_PORT.pid"
107 107
 
@@ -123,7 +123,7 @@ s#^dir .+\$#dir ${REDIS_DATA_DIR}#;\
123 123
 s#^pidfile .+\$#pidfile ${PIDFILE}#;\
124 124
 s#^daemonize no\$#daemonize yes#;" 
125 125
 echo $SED_EXPR
126  
-sed -r "$SED_EXPR" $DEFAULT_CONFIG  >> $TMP_FILE
  126
+sed -r "$SED_EXPR" "$DEFAULT_CONFIG"  >> $TMP_FILE
127 127
 
128 128
 #cat $TPL_FILE | while read line; do eval "echo \"$line\"" >> $TMP_FILE; done
129 129
 cp -f $TMP_FILE $REDIS_CONFIG_FILE || exit 1
@@ -159,7 +159,7 @@ REDIS_CHKCONFIG_INFO=\
159 159
 # Description: Redis daemon\n
160 160
 ### END INIT INFO\n\n"
161 161
 
162  
-if [ !`which chkconfig` ] ; then 
  162
+if [ ! `which chkconfig` ] ; then 
163 163
 	#combine the header and the template (which is actually a static footer)
164 164
 	echo $REDIS_INIT_HEADER > $TMP_FILE && cat $INIT_TPL_FILE >> $TMP_FILE || die "Could not write init script to $TMP_FILE"
165 165
 else
@@ -173,7 +173,7 @@ echo "Copied $TMP_FILE => $INIT_SCRIPT_DEST"
173 173
 
174 174
 #Install the service
175 175
 echo "Installing service..."
176  
-if [ !`which chkconfig` ] ; then 
  176
+if [ ! `which chkconfig` ] ; then 
177 177
 	#if we're not a chkconfig box assume we're able to use update-rc.d
178 178
 	update-rc.d redis_$REDIS_PORT defaults && echo "Success!"
179 179
 else
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.