Allow symlinking to work across many versions of lucene Change-Id: I42b30abf3e970475ec66278ccf9e1b0a82f57b06 Signed-off-by: Mat Booth <mat.booth@redhat.com> Reviewed-on: https://git.eclipse.org/r/67577
diff --git a/dependencies/replace_platform_plugins_with_symlinks.sh b/dependencies/replace_platform_plugins_with_symlinks.sh index 16dd275..ef91cd9 100755 --- a/dependencies/replace_platform_plugins_with_symlinks.sh +++ b/dependencies/replace_platform_plugins_with_symlinks.sh
@@ -9,17 +9,19 @@ SCL_JAVA_DIRS=${@:2} function _symlink { - _f=`ls | grep -e "^$1"` - rm -rf $_f - for SCL_JAVA_DIR in ${SCL_JAVA_DIRS}; do - if [ -f ${SCL_JAVA_DIR}/$2 ]; then - echo "found ${SCL_JAVA_DIR}/$2" - ln -s ${SCL_JAVA_DIR}/$2 ${_f%.jar}.jar - return 0 - fi - done - echo "not found $2 in any of ${SCL_JAVADIRS}" - exit 1 + _f=$(ls | grep -e "^$1" || :) + if [ -n "$_f" ] ; then + rm -rf $_f + for SCL_JAVA_DIR in ${SCL_JAVA_DIRS}; do + if [ -f ${SCL_JAVA_DIR}/$2 ]; then + echo "found ${SCL_JAVA_DIR}/$2" + ln -s ${SCL_JAVA_DIR}/$2 ${_f%.jar}.jar + return 0 + fi + done + echo "not found $2 in any of ${SCL_JAVA_DIRS}" + exit 1 + fi } pushd $1 @@ -49,7 +51,14 @@ _symlink org.apache.lucene.analyzers-smartcn_ lucene/lucene-analyzers-smartcn.jar _symlink org.apache.lucene.queries lucene/lucene-queries.jar _symlink org.apache.lucene.queryparser lucene/lucene-queryparser.jar - _symlink org.apache.lucene.sandbox lucene/lucene-sandbox.jar + _symlink org.apache.lucene.sandbox_ lucene/lucene-sandbox.jar + _symlink org.apache.lucene.spatial3d_ lucene/lucene-spatial3d.jar + _symlink org.apache.lucene.spatial_ lucene/lucene-spatial.jar + _symlink com.spatial4j_ spatial4j.jar + _symlink org.apache.xalan xalan-j2.jar + _symlink org.apache.xerces xerces-j2.jar + _symlink org.apache.xml.resolver xml-commons-resolver.jar + _symlink org.apache.xml.serializer xalan-j2-serializer.jar _symlink org.apache.regexp_ regexp.jar _symlink org.eclipse.jetty.util_ jetty/jetty-util.jar _symlink org.eclipse.jetty.server_ jetty/jetty-server.jar