[solr] branch main updated: SOLR-16259: Missing newline at the end of solr.in.sh breaks the installer.

[el...@apache.org]

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

elyograg 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 125bac6c561 SOLR-16259: Missing newline at the end of solr.in.sh breaks the installer.
125bac6c561 is described below

commit 125bac6c5612ea50913e394a08a855dafd41cbd7
Author: Shawn Heisey <el...@apache.org>
AuthorDate: Mon Jun 20 10:12:18 2022 -0600

    SOLR-16259: Missing newline at the end of solr.in.sh breaks the installer.
---
 solr/CHANGES.txt                 | 2 ++
 solr/bin/install_solr_service.sh | 3 ++-
 solr/bin/solr.in.sh              | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 99f8cfedb0f..bb2f237e56a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -87,6 +87,8 @@ Bug Fixes
 
 * SOLR-16218: failOnVersionConflicts option not working for in-place updates (Lamine Idjeraoui)
 
+* SOLR-16259: Missing newline at the end of solr.in.sh breaks the installer. (John Gately via Shawn Heisey)
+
 Other Changes
 ---------------------
 * SOLR-15897: Remove <jmx/> from all unit test solrconfig.xml files. (Eric Pugh)
diff --git a/solr/bin/install_solr_service.sh b/solr/bin/install_solr_service.sh
index 8da8edbb449..d3135d489ff 100755
--- a/solr/bin/install_solr_service.sh
+++ b/solr/bin/install_solr_service.sh
@@ -312,7 +312,8 @@ else
   cp "$SOLR_INSTALL_DIR/bin/solr.in.sh" "/etc/default/$SOLR_SERVICE.in.sh"
   mv "$SOLR_INSTALL_DIR/bin/solr.in.sh" "$SOLR_INSTALL_DIR/bin/solr.in.sh.orig"  
   mv "$SOLR_INSTALL_DIR/bin/solr.in.cmd" "$SOLR_INSTALL_DIR/bin/solr.in.cmd.orig"  
-  echo "SOLR_PID_DIR=\"$SOLR_VAR_DIR\"
+  echo "
+SOLR_PID_DIR=\"$SOLR_VAR_DIR\"
 SOLR_HOME=\"$SOLR_VAR_DIR/data\"
 LOG4J_PROPS=\"$SOLR_VAR_DIR/log4j2.xml\"
 SOLR_LOGS_DIR=\"$SOLR_VAR_DIR/logs\"
diff --git a/solr/bin/solr.in.sh b/solr/bin/solr.in.sh
index 5ec8e9e5bd3..df7f435fde6 100644
--- a/solr/bin/solr.in.sh
+++ b/solr/bin/solr.in.sh
@@ -268,4 +268,4 @@
 # SOLR_OPTS="$SOLR_OPTS -Dlog4j2.formatMsgNoLookups=true"
 
 # The bundled plugins in the "modules" folder can easily be enabled as a comma-separated list in SOLR_MODULES variable
-# SOLR_MODULES=extraction,ltr
\ No newline at end of file
+# SOLR_MODULES=extraction,ltr