[FLINK-6181][Start scripts] Fix regex in start scripts This closes #3605.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/dc13500d Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/dc13500d Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/dc13500d Branch: refs/heads/table-retraction Commit: dc13500dd5c8061eb75a64a62db6aa13f8fd5408 Parents: 5c44f53 Author: Robert Metzger <rmetz...@apache.org> Authored: Fri Mar 24 11:50:11 2017 +0100 Committer: zentol <ches...@apache.org> Committed: Wed Apr 5 20:48:44 2017 +0200 ---------------------------------------------------------------------- flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh | 2 +- flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/dc13500d/flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh b/flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh index 05a5208..cc8917b 100755 --- a/flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh +++ b/flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh @@ -35,7 +35,7 @@ while read server ; do server=$(echo -e "${server}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') # trim # match server.id=address[:port[:port]] - if [[ $server =~ ^server\.([0-9]+)[[:space:]]*\=([^: \#]+) ]]; then + if [[ $server =~ ^server\.([0-9]+)[[:space:]]*\=[[:space:]]*([^: \#]+) ]]; then id=${BASH_REMATCH[1]} address=${BASH_REMATCH[2]} http://git-wip-us.apache.org/repos/asf/flink/blob/dc13500d/flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh b/flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh index b306648..29ddae4 100755 --- a/flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh +++ b/flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh @@ -35,7 +35,7 @@ while read server ; do server=$(echo -e "${server}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//') # trim # match server.id=address[:port[:port]] - if [[ $server =~ ^server\.([0-9])+[[:space:]]*\=([^: \#]+) ]]; then + if [[ $server =~ ^server\.([0-9]+)[[:space:]]*\=[[:space:]]*([^: \#]+) ]]; then id=${BASH_REMATCH[1]} server=${BASH_REMATCH[2]}
