From 026b6be3bc7951ef6355b2ec6712555aea940d91 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Fri, 14 Feb 2020 17:07:48 -0500 Subject: [PATCH] 6059 change file name of xml to check to match file name it is listed in --- Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java | 2 +- .../org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java | 2 +- .../org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java index e729248b47..12415fac87 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java @@ -69,7 +69,7 @@ public class PlatformUtil { * @return absolute path string to the install root dir */ 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(); return rootPath.getAbsolutePath(); } diff --git a/Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java index d359332f84..fbc4ebc12b 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java @@ -269,7 +269,7 @@ public class PlasoIngestModule implements DataSourceIngestModule { String architectureFolder = PlatformUtil.is64BitOS() ? PLASO64 : PLASO32; 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) { throw new FileNotFoundException(executableName + " executable not found."); } diff --git a/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java b/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java index a8bf0591fb..6a84a2285c 100644 --- a/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java +++ b/Core/src/org/sleuthkit/autopsy/textextractors/TikaTextExtractor.java @@ -423,7 +423,7 @@ final class TikaTextExtractor implements TextExtractor { } 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) { return null; }