diff --git a/Core/build.xml b/Core/build.xml
index df8bf56464..7429307d43 100644
--- a/Core/build.xml
+++ b/Core/build.xml
@@ -134,8 +134,8 @@
-
+
release/modules/ext/spotbugs-annotations-4.6.0.jar
- ext/sqlite-jdbc-3.42.0.1.jar
- release/modules/ext/sqlite-jdbc-3.42.0.1.jar
+ ext/sqlite-jdbc-3.46.0.0.jar
+ release/modules/ext/sqlite-jdbc-3.46.0.0.jar
ext/txw2-2.3.3.jar
diff --git a/Core/src/org/sleuthkit/autopsy/core/Installer.java b/Core/src/org/sleuthkit/autopsy/core/Installer.java
index ac5c6e169f..a2fe9c9954 100644
--- a/Core/src/org/sleuthkit/autopsy/core/Installer.java
+++ b/Core/src/org/sleuthkit/autopsy/core/Installer.java
@@ -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 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();
diff --git a/ImageGallery/nbproject/project.xml b/ImageGallery/nbproject/project.xml
index 49221290cd..6941e4b187 100644
--- a/ImageGallery/nbproject/project.xml
+++ b/ImageGallery/nbproject/project.xml
@@ -142,8 +142,8 @@
- ext/sqlite-jdbc-3.42.0.1.jar
- release/modules/ext/sqlite-jdbc-3.42.0.1.jar
+ ext/sqlite-jdbc-3.46.0.0.jar
+ release/modules/ext/sqlite-jdbc-3.46.0.0.jar
diff --git a/RecentActivity/nbproject/project.xml b/RecentActivity/nbproject/project.xml
index 05745bb79a..bc1dd53aa8 100644
--- a/RecentActivity/nbproject/project.xml
+++ b/RecentActivity/nbproject/project.xml
@@ -88,8 +88,8 @@
release/modules/ext/Rejistry-1.1-SNAPSHOT.jar
- ext/sqlite-jdbc-3.42.0.1.jar
- release/modules/ext/sqlite-jdbc-3.42.0.1.jar
+ ext/sqlite-jdbc-3.46.0.0.jar
+ release/modules/ext/sqlite-jdbc-3.46.0.0.jar