Handle case where multiple symlinked jars provide same OSGi bundle.

When all system OSGi bundles are symlinked, there is a chance that
multiple locations may provide the same OSGi bundle. Although this is a
violation of expected guidelines, handle this case anyways. Also
suppress excessively verbose output.

1 files changed, 4 insertions, 1 deletions

diff --git a/prepAllTestBundles.sh b/prepAllTestBundles.sh
index 4c72a37..ebf32d9 100755
--- a/prepAllTestBundles.sh
+++ b/prepAllTestBundles.sh
@@ -85,7 +85,10 @@ for jar in `find ${testBundleFolder} -name "*.jar"`; do
     # Make 'Eclipse-BundleShape: dir'
     jarName=`basename ${jar}`
     symJarName=`ls target-sdk/plugins/ | grep ${jarName}`
-    rm target-sdk/plugins/${symJarName}
+    # Might be multiple symlinked jars providing same bundle (rare)
+    for file in ${symJarName}; do
+      rm target-sdk/plugins/${file}
+    done
     cp ${jar} target-sdk/plugins/
     jar -umf ./MANIFEST.MF target-sdk/plugins/${jarName}