From: Dennis Schafroth <dennis@indexdata.com>
Date: Mon, 2 Sep 2013 14:42:47 +0000 (+0200)
Subject: Fix PATH overriding
X-Git-Tag: v0.5.1~5
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=2f2e53226405dd2b1b782dab4233360abacbe96c;p=lui-solr.git

Fix PATH overriding
---

diff --git a/scripts/commit_solr.sh b/scripts/commit_solr.sh
index 6e3dff2..df587ab 100644
--- a/scripts/commit_solr.sh
+++ b/scripts/commit_solr.sh
@@ -5,13 +5,13 @@ if [ "$2" != "" ] ; then
     HOST_PORT="$2"
 fi
 
-PATH=solr4
+SOLR_PATH=solr4
 if [ "$2" != "" ] ; then 
-    PATH="$2"
+    SOLR_PATH="$2"
 fi
 
 if [ "$1" == "-h" ] ; then 
-    echo "$0 [[HOST:PORT] PATH] (default $HOST_PORT/$PATH)"
+    echo "$0 [[HOST:PORT] SOLR_PATH] (default $HOST_PORT/$SOLR_PATH)"
 fi
 
-curl http://$HOST:$PORT/$PATH/update -H "Content-Type: text/xml" --data-binary '<commit waitFlush="false" waitSearcher="false" expungeDeletes="true"/>'
\ No newline at end of file
+curl http://$HOST:$PORT/$SOLR_PATH/update -H "Content-Type: text/xml" --data-binary '<commit waitFlush="false" waitSearcher="false" expungeDeletes="true"/>'
\ No newline at end of file
diff --git a/scripts/delete_solr.sh b/scripts/delete_solr.sh
index c5f9f85..6c51408 100755
--- a/scripts/delete_solr.sh
+++ b/scripts/delete_solr.sh
@@ -6,9 +6,9 @@ if [ "$2" != "" ] ; then
     HOST_PORT="$2"
 fi 
 
-PATH=solr4
+SOLR_PATH=solr4
 if [ "$3" != "" ] ; then 
-    PATH="$3"
+    SOLR_PATH="$3"
 fi
 
 if [ "$1" == "" ] ; then 
@@ -16,5 +16,5 @@ if [ "$1" == "" ] ; then
     exit 1 ; 
 fi  
 
-curl http://${HOST_PORT}/$PATH/update -H "Content-Type: text/xml" --data-binary "<delete><query>database:$1</query></delete>"
-curl http://${HOST_PORT}/$PATH/update -H "Content-Type: text/xml" --data-binary '<commit waitFlush="false" waitSearcher="false"/>'
+curl http://${HOST_PORT}/$SOLR_PATH/update -H "Content-Type: text/xml" --data-binary "<delete><query>database:$1</query></delete>"
+curl http://${HOST_PORT}/$SOLR_PATH/update -H "Content-Type: text/xml" --data-binary '<commit waitFlush="false" waitSearcher="false"/>'
diff --git a/scripts/optimize_solr.sh b/scripts/optimize_solr.sh
index d608b4a..83e4219 100755
--- a/scripts/optimize_solr.sh
+++ b/scripts/optimize_solr.sh
@@ -6,15 +6,15 @@ if [ "$2" != "" ] ; then
     HOST_PORT="$2"
 fi
 
-PATH=solr4
+SOLR_PATH=solr4
 if [ "$3" != "" ] ; then 
-    PATH="$3"
+    SOLR_PATH="$3"
 fi
 
 if [ "$1" != "YES" ] ; then 
-    echo "$0 YES [[HOST:PORT] PATH] (default $HOST_PORT/$PATH)"
+    echo "$0 YES [[HOST:PORT] SOLR_PATH] (default $HOST_PORT/$SOLR_PATH)"
     exit 1 ; 
 fi  
 
 
-curl http://${HOST_PORT}/$PATH/update -H "Content-Type: text/xml" --data-binary '<optimize waitSearcher="false" expungeDeletes="true" />'
+curl http://${HOST_PORT}/$SOLR_PATH/update -H "Content-Type: text/xml" --data-binary '<optimize waitSearcher="false" expungeDeletes="true" />'