Changeset 24714

Timestamp:

2011-10-05T13:57:33+13:00 (13 years ago)

Author:

davidb

Message:

Corrected 'gsdlsrc' to 'gsdlsrcdir' variable, plus made the decision to remove web/ext/solr based on whether 'web' exists or not

File:

• gs3-extensions/solr/trunk/src/DEL-SERVICE.sh (modified) (2 diffs)

gs3-extensions/solr/trunk/src/DEL-SERVICE.sh

@@ -15 +15 @@
 if [ -d backup ] ; then
   echo "Reverting GS2LuceneSearch to nolonger inherit from SharedSoleneGS2FieldSearch.java"
-  /bin/rm ../../$gsdlsrc/service/SharedSoleneGS2FieldSearch.java 
-  /bin/rm ../../$gsdlsrc/service/GS2LuceneSearch.java 
-  /bin/mv backup/GS2LuceneSearch.java $gsdlsrc/service/.
+  /bin/rm ../../$gsdlsrcdir/service/SharedSoleneGS2FieldSearch.java 
+  /bin/rm ../../$gsdlsrcdir/service/GS2LuceneSearch.java 
+  /bin/mv backup/GS2LuceneSearch.java $gsdlsrcdir/service/.
   rmdir backup
 fi
@@ -31 +31 @@
   /bin/rm -f "../../$classesdir/$f"
 done
+
+webextdir=ext/solr
+
+if [ -d web ] ;
+  # remove the content of the web folder copied in by ADD-SERVICE.sh
+  /bin/rm -r ../../$webextdir
+fi