Changeset 24713 for gs3-extensions/solr

Timestamp:

2011-10-05T13:54:01+13:00 (13 years ago)

Author:

davidb

Message:

Corrected 'gsdlsrc' to 'gsdlsrcdir' variable, plus made the decision to copy web/* based on whether 'web' exists or not

File:

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

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

@@ -15 +15 @@
   echo "Patching GS2LuceneSearch to inherit from SharedSoleneGS2FieldSearch.java"
   mkdir backup
-  /bin/mv ../../$gsdlsrc/service/GS2LuceneSearch.java backup/.
-  /bin/cp $gsdlsrc/service/GS2LuceneSearch.java ../../$gsdlsrc/service/.
-  /bin/cp $gsdlsrc/service/SharedSoleneGS2FieldSearch.java ../../$gsdlsrc/service/.
+  /bin/mv ../../$gsdlsrcdir/service/GS2LuceneSearch.java backup/.
+  /bin/cp $gsdlsrcdir/service/GS2LuceneSearch.java ../../$gsdlsrcdir/service/.
+  /bin/cp $gsdlsrcdir/service/SharedSoleneGS2FieldSearch.java ../../$gsdlsrcdir/service/.
 fi
 
@@ -37 +37 @@
 fi
 
-# copy the content of the web folder (avoiding the top-level .svn directory)
-/bin/cp -r web/* ../../$webextdir/.
+if [ -d web ] ;
+  # copy the content of the web folder (avoiding the top-level .svn directory)
+  /bin/cp -r web/* ../../$webextdir/.
+fi