Merge branch 'develop' of github.com:sleuthkit/autopsy into graphicsEnvHeadless

This commit is contained in:
Greg DiCristofaro 2024-07-05 06:46:38 -04:00
commit 68578b6569
5 changed files with 11 additions and 10 deletions

View File

@ -134,8 +134,8 @@
<property environment="env"/>
<copy file="${env.TSK_HOME}/bindings/java/dist/sleuthkit-${TSK_VERSION}.jar"
tofile="${ext.dir}/sleuthkit-${TSK_VERSION}.jar"/>
<copy file="${env.TSK_HOME}/bindings/java/lib/sqlite-jdbc-3.42.0.1.jar"
tofile="${ext.dir}/sqlite-jdbc-3.42.0.1.jar"/>
<copy file="${env.TSK_HOME}/bindings/java/lib/sqlite-jdbc-3.46.0.0.jar"
tofile="${ext.dir}/sqlite-jdbc-3.46.0.0.jar"/>
<copy file="${env.TSK_HOME}/bindings/java/lib/postgresql-42.7.3.jar"
tofile="${ext.dir}/postgresql-42.7.3.jar"/>
<copy file="${env.TSK_HOME}/bindings/java/lib/c3p0-0.9.5.5.jar"

View File

@ -742,8 +742,8 @@
<binary-origin>release/modules/ext/spotbugs-annotations-4.6.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/sqlite-jdbc-3.42.0.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/sqlite-jdbc-3.42.0.1.jar</binary-origin>
<runtime-relative-path>ext/sqlite-jdbc-3.46.0.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/sqlite-jdbc-3.46.0.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/txw2-2.3.3.jar</runtime-relative-path>

View File

@ -67,7 +67,7 @@ public class Installer extends ModuleInstall {
private static final long serialVersionUID = 1L;
private static final String JAVA_TEMP = "java.io.tmpdir";
private static final String AUTOPSY_TEMP_DIR = "autopsy_temp";
private static final String AUTOPSY_TEMP_DIR_SUFFIX = "_temp";
private static final String TSK_TEMP = "tsk.tmpdir";
private final List<ModuleInstall> packageInstallers;
@ -93,7 +93,8 @@ public class Installer extends ModuleInstall {
private static void setTskTemp() {
try {
String curTemp = System.getProperty(JAVA_TEMP, "");
String tskTemp = curTemp + (curTemp.endsWith(File.separator) ? "" : File.separator) + AUTOPSY_TEMP_DIR;
String autopsyTempDir = StringUtils.defaultIfBlank(UserPreferences.getAppName(), "autopsy").replaceAll("[^a-zA-Z0-9_\\-]", "_") + AUTOPSY_TEMP_DIR_SUFFIX;
String tskTemp = Paths.get(StringUtils.defaultString(curTemp), autopsyTempDir).toString();
System.setProperty(TSK_TEMP, tskTemp);
File tskTempDir = new File(tskTemp);
tskTempDir.mkdirs();

View File

@ -142,8 +142,8 @@
</module-dependencies>
<public-packages/>
<class-path-extension>
<runtime-relative-path>ext/sqlite-jdbc-3.42.0.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/sqlite-jdbc-3.42.0.1.jar</binary-origin>
<runtime-relative-path>ext/sqlite-jdbc-3.46.0.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/sqlite-jdbc-3.46.0.0.jar</binary-origin>
</class-path-extension>
</data>
</configuration>

View File

@ -88,8 +88,8 @@
<binary-origin>release/modules/ext/Rejistry-1.1-SNAPSHOT.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/sqlite-jdbc-3.42.0.1.jar</runtime-relative-path>
<binary-origin>release/modules/ext/sqlite-jdbc-3.42.0.1.jar</binary-origin>
<runtime-relative-path>ext/sqlite-jdbc-3.46.0.0.jar</runtime-relative-path>
<binary-origin>release/modules/ext/sqlite-jdbc-3.46.0.0.jar</binary-origin>
</class-path-extension>
</data>
</configuration>