Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-8486: No longer require jar/unzip for bin/solr 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1722988 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jan Høydahl 2016-01-04 23:39:52 +00:00
parent 6a9c381c07
commit d478d7a293
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -424,6 +424,8 @@ Other Changes
* SOLR-8481: TestSearchPerf no longer needs to duplicate SolrIndexSearcher.(NO_CHECK_QCACHE|NO_CHECK_FILTERCACHE) * SOLR-8481: TestSearchPerf no longer needs to duplicate SolrIndexSearcher.(NO_CHECK_QCACHE|NO_CHECK_FILTERCACHE)
(Christine Poerschke) (Christine Poerschke)
* SOLR-8486: No longer require jar/unzip for bin/solr (Steven E. Harris, janhoy)
================== 5.4.0 ================== ================== 5.4.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release

9
solr/bin/solr
View File

@ -49,15 +49,6 @@ SOLR_SCRIPT="$0"
verbose=false verbose=false
THIS_OS=`uname -s` THIS_OS=`uname -s`
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
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 stop_all=false
# for now, we don't support running this script from cygwin due to problems # for now, we don't support running this script from cygwin due to problems