Merge pull request #5653 from wschaeferB/6059-EliminateNoModuleFoundMessages

6059 change file name of xml to check to match file name it is listed in
This commit is contained in:
Richard Cordovano 2020-02-21 17:03:41 -05:00 committed by GitHub
commit 94e41680d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View File

@ -69,7 +69,7 @@ public class PlatformUtil {
* @return absolute path string to the install root dir * @return absolute path string to the install root dir
*/ */
public static String getInstallPath() { public static String getInstallPath() {
File coreFolder = InstalledFileLocator.getDefault().locate("core", PlatformUtil.class.getPackage().getName(), false); //NON-NLS File coreFolder = InstalledFileLocator.getDefault().locate("core", "org.sleuthkit.autopsy.core", false); //NON-NLS
File rootPath = coreFolder.getParentFile().getParentFile(); File rootPath = coreFolder.getParentFile().getParentFile();
return rootPath.getAbsolutePath(); return rootPath.getAbsolutePath();
} }

View File

@ -269,7 +269,7 @@ public class PlasoIngestModule implements DataSourceIngestModule {
String architectureFolder = PlatformUtil.is64BitOS() ? PLASO64 : PLASO32; String architectureFolder = PlatformUtil.is64BitOS() ? PLASO64 : PLASO32;
String executableToFindName = Paths.get(PLASO, architectureFolder, executableName).toString(); String executableToFindName = Paths.get(PLASO, architectureFolder, executableName).toString();
File exeFile = InstalledFileLocator.getDefault().locate(executableToFindName, PlasoIngestModule.class.getPackage().getName(), false); File exeFile = InstalledFileLocator.getDefault().locate(executableToFindName, "org.sleuthkit.autopsy.core", false);
if (null == exeFile || exeFile.canExecute() == false) { if (null == exeFile || exeFile.canExecute() == false) {
throw new FileNotFoundException(executableName + " executable not found."); throw new FileNotFoundException(executableName + " executable not found.");
} }

View File

@ -423,7 +423,7 @@ final class TikaTextExtractor implements TextExtractor {
} }
String executableToFindName = Paths.get(TESSERACT_DIR_NAME, TESSERACT_EXECUTABLE).toString(); String executableToFindName = Paths.get(TESSERACT_DIR_NAME, TESSERACT_EXECUTABLE).toString();
File exeFile = InstalledFileLocator.getDefault().locate(executableToFindName, TikaTextExtractor.class.getPackage().getName(), false); File exeFile = InstalledFileLocator.getDefault().locate(executableToFindName, "org.sleuthkit.autopsy.core", false);
if (null == exeFile) { if (null == exeFile) {
return null; return null;
} }