You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2015/01/31 02:32:03 UTC
svn commit: r1656133 - in /lucene/dev/trunk/solr: CHANGES.txt bin/solr
Author: sarowe
Date: Sat Jan 31 01:32:03 2015
New Revision: 1656133
URL: http://svn.apache.org/r1656133
Log:
SOLR-7067: bin/solr won't run under bash 4.2+
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/bin/solr
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1656133&r1=1656132&r2=1656133&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sat Jan 31 01:32:03 2015
@@ -579,6 +579,8 @@ Bug Fixes
* SOLR-6969: When opening an HDFSTransactionLog for append we must first attempt to recover
it's lease to prevent data loss. (Mark Miller, Praneeth Varma, Colin McCabe)
+* SOLR-7067: bin/solr won't run under bash 4.2+. (Steve Rowe)
+
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/bin/solr
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/bin/solr?rev=1656133&r1=1656132&r2=1656133&view=diff
==============================================================================
--- lucene/dev/trunk/solr/bin/solr (original)
+++ lucene/dev/trunk/solr/bin/solr Sat Jan 31 01:32:03 2015
@@ -48,19 +48,14 @@
SOLR_SCRIPT="$0"
verbose=false
THIS_OS=`uname -s`
-hasLsof=$(which lsof)
-hasJar=$(which jar 2>/dev/null)
-hasUnzip=$(which unzip 2>/dev/null)
-if [ ${hasJar} ]; then
- unzipCommand="$hasJar xf"
+if hash jar 2>/dev/null ; then # hash returns true if jar is on the path
+ UNPACK_WAR_CMD="$(command -v jar) xf"
+elif hash unzip 2>/dev/null ; then # hash returns true if unzip is on the path
+ UNPACK_WAR_CMD="$(command -v unzip) -q"
else
- if [ ${hasUnzip} ]; then
- unzipCommand="$hasUnzip"
- else
- echo -e "This script requires extracting a WAR file with either the jar or unzip utility, please install these utilities or contact your administrator for assistance."
- exit 1
- fi
+ echo -e "This script requires extracting a WAR file with either the jar or unzip utility, please install these utilities or contact your administrator for assistance."
+ exit 1
fi
stop_all=false
@@ -385,7 +380,7 @@ function run_tool() {
# Extract the solr.war if it hasn't been done already (so we can access the SolrCLI class)
if [[ -e $DEFAULT_SERVER_DIR/webapps/solr.war && ! -d "$DEFAULT_SERVER_DIR/solr-webapp/webapp" ]]; then
- (mkdir -p $DEFAULT_SERVER_DIR/solr-webapp/webapp && cd $DEFAULT_SERVER_DIR/solr-webapp/webapp && "$unzipCommand" $DEFAULT_SERVER_DIR/webapps/solr.war)
+ (mkdir -p $DEFAULT_SERVER_DIR/solr-webapp/webapp && cd $DEFAULT_SERVER_DIR/solr-webapp/webapp && $UNPACK_WAR_CMD $DEFAULT_SERVER_DIR/webapps/solr.war)
fi
"$JAVA" $SOLR_SSL_OPTS -Dsolr.install.dir=$SOLR_TIP -Dlog4j.configuration=file:$DEFAULT_SERVER_DIR/scripts/cloud-scripts/log4j.properties \
@@ -976,7 +971,7 @@ if [ "$EXAMPLE" != "" ]; then
fi
# check to see if something is already bound to that port
- if [ "$hasLsof" != "" ]; then
+ if hash lsof 2>/dev/null ; then # hash returns true if lsof is on the path
PORT_IN_USE=`lsof -Pni:$CLOUD_PORT`
if [ "$PORT_IN_USE" != "" ]; then
read -e -p "Oops! Looks like port $CLOUD_PORT is already being used by another process. Please choose a different port. " USER_INPUT
@@ -1357,7 +1352,7 @@ $SOLR_OPTS"
nohup $JAVA $SOLR_START_OPTS $SOLR_ADDL_ARGS -XX:OnOutOfMemoryError="$SOLR_TIP/bin/oom_solr.sh $SOLR_PORT $SOLR_LOGS_DIR" -jar start.jar 1>$SOLR_LOGS_DIR/solr-$SOLR_PORT-console.log 2>&1 & echo $! > $SOLR_PID_DIR/solr-$SOLR_PORT.pid
# no lsof on cygwin though
- if [ "$hasLsof" != "" ]; then
+ if hash lsof 2>/dev/null ; then # hash returns true if lsof is on the path
echo -n "Waiting to see Solr listening on port $SOLR_PORT"
# Launch in a subshell to show the spinner
(loops=0