diff options
| author | Salvatore Sanfilippo <antirez@gmail.com> | 2017-07-24 15:20:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-24 15:20:31 +0200 |
| commit | dc997755bf8c2d69899957a8ab6dc41aed0c7ddb (patch) | |
| tree | c42d41ffb6f7431f6bf5baef923c2b2bac2e27b9 | |
| parent | 6b64cc47a07005af1c3dfff7469d76e2ed1a8ea7 (diff) | |
| parent | 367035a9838695c1f17a78af0325de5ae6ec08fc (diff) | |
| download | redis-dc997755bf8c2d69899957a8ab6dc41aed0c7ddb.tar.gz | |
Merge pull request #1934 from badboy/install-script-1922
Don't use extended Regexp Syntax
| -rwxr-xr-x | utils/install_server.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/utils/install_server.sh b/utils/install_server.sh index 3d920a125..7eb341417 100755 --- a/utils/install_server.sh +++ b/utils/install_server.sh @@ -168,13 +168,13 @@ fi echo "## Generated by install_server.sh ##" > $TMP_FILE read -r SED_EXPR <<-EOF -s#^port [0-9]{4}\$#port ${REDIS_PORT}#; \ -s#^logfile .+\$#logfile ${REDIS_LOG_FILE}#; \ -s#^dir .+\$#dir ${REDIS_DATA_DIR}#; \ -s#^pidfile .+\$#pidfile ${PIDFILE}#; \ -s#^daemonize no\$#daemonize yes#; +s#^port .\+#port ${REDIS_PORT}#; \ +s#^logfile .\+#logfile ${REDIS_LOG_FILE}#; \ +s#^dir .\+#dir ${REDIS_DATA_DIR}#; \ +s#^pidfile .\+#pidfile ${PIDFILE}#; \ +s#^daemonize no#daemonize yes#; 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 cp $TMP_FILE $REDIS_CONFIG_FILE || die "Could not write redis config file $REDIS_CONFIG_FILE" |