[solr] branch main updated: SOLR-15700: Make include paths in bin/solr consistent (#358)

[ep...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

epugh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new cee22de  SOLR-15700: Make include paths in bin/solr consistent (#358)
cee22de is described below

commit cee22de67dbee70c48266b176401edf1e7427b11
Author: turnertg <46...@users.noreply.github.com>
AuthorDate: Fri Nov 19 12:09:11 2021 -0800

    SOLR-15700: Make include paths in bin/solr consistent (#358)
---
 solr/CHANGES.txt | 2 ++
 solr/bin/solr    | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index bec177c..dac8c1b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -468,6 +468,8 @@ Improvements
 
 * SOLR-15707: Add the ability to set the AWS Profile per S3Repository (Houston Putman)
 
+* SOLR-15700: Make include paths in bin/solr consistent (turnertg, janhoy via Eric Pugh)
+
 Optimizations
 ---------------------
 (No changes)
diff --git a/solr/bin/solr b/solr/bin/solr
index 0c46a26..b8e68f0 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -22,11 +22,12 @@
 # file named solr.in.sh to set environment variables. Specifically,
 # the following locations are searched in this order:
 #
-# ./
+# <script location>/.
 # $HOME/.solr.in.sh
 # /usr/share/solr
 # /usr/local/share/solr
-# /var/solr/
+# /etc/default
+# /var/solr
 # /opt/solr
 #
 # Another option is to specify the full path to the include file in the
@@ -86,6 +87,7 @@ if [ -z "$SOLR_INCLUDE" ]; then
                /usr/share/solr/solr.in.sh \
                /usr/local/share/solr/solr.in.sh \
                /etc/default/solr.in.sh \
+               /var/solr/solr.in.sh \
                /opt/solr/solr.in.sh; do
     if [ -r "$include" ]; then
         SOLR_INCLUDE="$include"