Merge pull request dadoonet#1271 from NickUfer/fix_jpeg2000

fix: not working optional libraries (e.g. jpeg2000)
kaleido-io · Oct 12, 2021 · 79863c8 · 79863c8
2 parents d44afec + 7c9f530
commit 79863c8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -45,6 +45,8 @@
         <docker.ocr.assembly.descriptor>${docker.noocr.assembly.descriptor}</docker.ocr.assembly.descriptor>
         <docker.ocr.assembly.mode>${docker.noocr.assembly.mode}</docker.ocr.assembly.mode>
         <docker.ocr.args.langsPkg>imagemagick tesseract-ocr tesseract-ocr-all</docker.ocr.args.langsPkg>
+
+        <distribution.mainClassName>fr.pilato.elasticsearch.crawler.fs.cli.FsCrawler</distribution.mainClassName>
     </properties>
 
     <dependencies>
@@ -85,8 +87,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <addClasspath>true</addClasspath>
-                            <mainClass>fr.pilato.elasticsearch.crawler.fs.cli.FsCrawler</mainClass>
+                            <mainClass>${distribution.mainClassName}</mainClass>
                         </manifest>
                     </archive>
                 </configuration>

diff --git a/distribution/src/main/scripts/fscrawler b/distribution/src/main/scripts/fscrawler
@@ -52,4 +52,4 @@ esac
 # If the user defined FS_JAVA_OPTS, we will use it to start the crawler
 JAVA_OPTS="$JAVA_OPTS $FS_JAVA_OPTS"
 
-exec "$JAVA" ${JAVA_OPTS} -cp "$FS_CLASSPATH" -jar "$FS_HOME/lib/${project.build.finalName}.jar" "$@"
+exec "$JAVA" ${JAVA_OPTS} -cp "$FS_CLASSPATH" "${distribution.mainClassName}" "$@"
diff --git a/distribution/src/main/scripts/fscrawler.bat b/distribution/src/main/scripts/fscrawler.bat
@@ -66,7 +66,7 @@ FOR /F "usebackq tokens=1* delims= " %%A IN (!params!) DO (
 	)
 )
 
-%JAVA% %JAVA_OPTS% -cp "%FS_CLASSPATH%" -jar "%FS_HOME%/lib/${project.build.finalName}.jar" !newparams!
+%JAVA% %JAVA_OPTS% -cp "%FS_CLASSPATH%" "${distribution.mainClassName}" !newparams!
 REM Return to original directory
 POPD
 ENDLOCAL