svn commit: r1651435 - /lucene/dev/trunk/solr/bin/install_solr_service.sh

[th...@apache.org]

Author: thelabdude
Date: Tue Jan 13 18:15:48 2015
New Revision: 1651435

URL: http://svn.apache.org/r1651435
Log:
SOLR-6851: Set the SOLR_VAR_DIR using the SOLR_SERVICE variable, thus alleviating the need to specify the -d option when overrding the service name with -s

Modified:
    lucene/dev/trunk/solr/bin/install_solr_service.sh

Modified: lucene/dev/trunk/solr/bin/install_solr_service.sh
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/bin/install_solr_service.sh?rev=1651435&r1=1651434&r2=1651435&view=diff
==============================================================================
--- lucene/dev/trunk/solr/bin/install_solr_service.sh (original)
+++ lucene/dev/trunk/solr/bin/install_solr_service.sh Tue Jan 13 18:15:48 2015
@@ -166,24 +166,24 @@ if [ ! -d "$SOLR_EXTRACT_DIR" ]; then
   exit 1
 fi
 
+if [ -z "$SOLR_SERVICE" ]; then
+  SOLR_SERVICE=solr
+fi
+
 if [ -z "$SOLR_VAR_DIR" ]; then
-  SOLR_VAR_DIR=/var/solr
+  SOLR_VAR_DIR=/var/$SOLR_SERVICE
 fi
 
 if [ -z "$SOLR_USER" ]; then
   SOLR_USER=solr
 fi
 
-if [ -z "$SOLR_SERVICE" ]; then
-  SOLR_SERVICE=solr
-fi
-
 if [ -z "$SOLR_PORT" ]; then
   SOLR_PORT=8983
 fi
 
 if [ -f "/etc/init.d/$SOLR_SERVICE" ]; then
-  echo -e "\nERROR: /etc/init.d/$SOLR_SERVICE already exists! Perhaps solr is already setup as a service on this host?\n" 1>&2
+  echo -e "\nERROR: /etc/init.d/$SOLR_SERVICE already exists! Perhaps Solr is already setup as a service on this host?\n" 1>&2
   exit 1
 fi