Commit 7fcca9ba authored by Jan-Erik Rediger's avatar Jan-Erik Rediger Committed by antirez
Browse files

Don't use extended Regexp Syntax

It's not POSIX (BSD systems have -E instead) and we don't actually need it.

Closes #1922
parent 41963fe6
...@@ -135,13 +135,13 @@ fi ...@@ -135,13 +135,13 @@ fi
echo "## Generated by install_server.sh ##" > $TMP_FILE echo "## Generated by install_server.sh ##" > $TMP_FILE
read -r SED_EXPR <<-EOF read -r SED_EXPR <<-EOF
s#^port [0-9]{4}\$#port ${REDIS_PORT}#; \ s#^port .\+#port ${REDIS_PORT}#; \
s#^logfile .+\$#logfile ${REDIS_LOG_FILE}#; \ s#^logfile .\+#logfile ${REDIS_LOG_FILE}#; \
s#^dir .+\$#dir ${REDIS_DATA_DIR}#; \ s#^dir .\+#dir ${REDIS_DATA_DIR}#; \
s#^pidfile .+\$#pidfile ${PIDFILE}#; \ s#^pidfile .\+#pidfile ${PIDFILE}#; \
s#^daemonize no\$#daemonize yes#; s#^daemonize no#daemonize yes#;
EOF EOF
sed -r "$SED_EXPR" $DEFAULT_CONFIG >> $TMP_FILE sed "$SED_EXPR" $DEFAULT_CONFIG >> $TMP_FILE
#cat $TPL_FILE | while read line; do eval "echo \"$line\"" >> $TMP_FILE; done #cat $TPL_FILE | while read line; do eval "echo \"$line\"" >> $TMP_FILE; done
cp $TMP_FILE $REDIS_CONFIG_FILE || die "Could not write redis config file $REDIS_CONFIG_FILE" cp $TMP_FILE $REDIS_CONFIG_FILE || die "Could not write redis config file $REDIS_CONFIG_FILE"
......
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