From d478d7a2939202d92654785c5c46e42b128318f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Mon, 4 Jan 2016 23:39:52 +0000 Subject: [PATCH] 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 --- solr/CHANGES.txt | 2 ++ solr/bin/solr | 9 --------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index e92e36e3146..54f8daee853 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -424,6 +424,8 @@ Other Changes * SOLR-8481: TestSearchPerf no longer needs to duplicate SolrIndexSearcher.(NO_CHECK_QCACHE|NO_CHECK_FILTERCACHE) (Christine Poerschke) +* SOLR-8486: No longer require jar/unzip for bin/solr (Steven E. Harris, janhoy) + ================== 5.4.0 ================== Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release diff --git a/solr/bin/solr b/solr/bin/solr index 175f420d57c..904c2c389e1 100755 --- a/solr/bin/solr +++ b/solr/bin/solr @@ -49,15 +49,6 @@ SOLR_SCRIPT="$0" verbose=false 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 # for now, we don't support running this script from cygwin due to problems