From commits-return-101601-archive-asf-public=cust-asf.ponee.io@lucene.apache.org Wed Jun 13 02:57:30 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 4A4F418063A for ; Wed, 13 Jun 2018 02:57:30 +0200 (CEST) Received: (qmail 73558 invoked by uid 500); 13 Jun 2018 00:57:24 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 73548 invoked by uid 99); 13 Jun 2018 00:57:24 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Jun 2018 00:57:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1CF73E109D; Wed, 13 Jun 2018 00:57:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sarowe@apache.org To: commits@lucene.apache.org Date: Wed, 13 Jun 2018 00:57:24 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] lucene-solr:master: SOLR-12434: Fix 'bin/solr config' endless loop parsing cmdline args Repository: lucene-solr Updated Branches: refs/heads/branch_7x ab2f97988 -> b412769ec refs/heads/master ba62472bd -> ade22a1ef SOLR-12434: Fix 'bin/solr config' endless loop parsing cmdline args Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ade22a1e Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ade22a1e Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ade22a1e Branch: refs/heads/master Commit: ade22a1ef99cb819e7ee35ac1c31ba6470b97a2a Parents: ba62472 Author: Steve Rowe Authored: Tue Jun 12 20:56:57 2018 -0400 Committer: Steve Rowe Committed: Tue Jun 12 20:56:57 2018 -0400 ---------------------------------------------------------------------- solr/bin/solr | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ade22a1e/solr/bin/solr ---------------------------------------------------------------------- diff --git a/solr/bin/solr b/solr/bin/solr index 4ea9d62..9384525 100755 --- a/solr/bin/solr +++ b/solr/bin/solr @@ -912,6 +912,7 @@ if [[ "$SCRIPT_CMD" == "config" ]]; then if [ $# -gt 0 ]; then while true; do + echo "Got here #1" case "$1" in -z|-zkhost|-zkHost) if [[ -z "$2" || "${2:0:1}" == "-" ]]; then @@ -930,11 +931,17 @@ if [[ "$SCRIPT_CMD" == "config" ]]; then shift 2 ;; *) # Pass through all other params - CONFIG_PARAMS+=($1) + if [ "$1" != "" ]; then + CONFIG_PARAMS+=($1) + shift + else + break + fi ;; esac done fi +echo run_tool config -zkHost "$ZK_HOST" -scheme "$SOLR_URL_SCHEME" "${CONFIG_PARAMS[@]}" run_tool config -zkHost "$ZK_HOST" -scheme "$SOLR_URL_SCHEME" "${CONFIG_PARAMS[@]}" exit $? fi