svn commit: r1693959 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/CHANGES.txt solr/bin/ solr/bin/post

[eh...@apache.org]

Author: ehatcher
Date: Mon Aug  3 19:36:10 2015
New Revision: 1693959

URL: http://svn.apache.org/r1693959
Log:
SOLR-7832: bin/post now allows either -url or -c, rather than requiring both (merged from trunk r1693958)

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_5x/solr/bin/   (props changed)
    lucene/dev/branches/branch_5x/solr/bin/post

Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1693959&r1=1693958&r2=1693959&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Mon Aug  3 19:36:10 2015
@@ -340,6 +340,8 @@ Other Changes
 
 * SOLR-7863: Lowercase the CLUSTERPROP command in ZkCLI for consistency, print error for unknown cmd (janhoy)
 
+* SOLR-7832: bin/post now allows either -url or -c, rather than requiring both. (ehatcher)
+
 ==================  5.2.1 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release

Modified: lucene/dev/branches/branch_5x/solr/bin/post
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/bin/post?rev=1693959&r1=1693958&r2=1693959&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/bin/post (original)
+++ lucene/dev/branches/branch_5x/solr/bin/post Mon Aug  3 19:36:10 2015
@@ -135,7 +135,7 @@ while [ $# -gt 0 ]; do
         shift
         COLLECTION="$1"
       elif [[ "$1" == "-p" ]]; then
-        # -p => -port for convenience and compatability with bin/solr start
+        # -p alias for -port for convenience and compatibility with `bin/solr start`
         shift
         PROPS+=("-Dport=$1")
       elif [[ ("$1" == "-d" || "$1" == "--data" || "$1" == "-") ]]; then
@@ -156,6 +156,9 @@ while [ $# -gt 0 ]; do
         shift
 #       echo "$1: PROP"
         PROPS+=("-D$key=$1")
+        if [[ "$key" == "url" ]]; then
+          SOLR_URL=$1
+        fi
       fi
     else
       echo -e "\nUnrecognized argument: $1\n"
@@ -167,8 +170,8 @@ while [ $# -gt 0 ]; do
 done
 
 # Check for errors
-if [[ $COLLECTION == "" ]]; then
-  echo -e "\nCollection must be specified.  Use -c <collection name> or set DEFAULT_SOLR_COLLECTION in your environment.\n"
+if [[ $COLLECTION == "" && $SOLR_URL == "" ]]; then
+  echo -e "\nCollection or URL must be specified.  Use -c <collection name> or set DEFAULT_SOLR_COLLECTION in your environment, or use -url instead.\n"
   echo -e "See '$THIS_SCRIPT -h' for usage instructions.\n"
   exit 1
 fi