app name used in tempdir

This commit is contained in:
Greg DiCristofaro 2024-05-28 15:19:08 -04:00
parent 89f765dd4b
commit 41ed4f0a12
2 changed files with 14 additions and 2 deletions

View File

@ -67,7 +67,7 @@ public class Installer extends ModuleInstall {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final String JAVA_TEMP = "java.io.tmpdir"; 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 static final String TSK_TEMP = "tsk.tmpdir";
private final List<ModuleInstall> packageInstallers; private final List<ModuleInstall> packageInstallers;
@ -93,7 +93,8 @@ public class Installer extends ModuleInstall {
private static void setTskTemp() { private static void setTskTemp() {
try { try {
String curTemp = System.getProperty(JAVA_TEMP, ""); 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); System.setProperty(TSK_TEMP, tskTemp);
File tskTempDir = new File(tskTemp); File tskTempDir = new File(tskTemp);
tskTempDir.mkdirs(); tskTempDir.mkdirs();

View File

@ -21,6 +21,17 @@
<location>C:/Development/42six/trunk/thirdparty/pasco2/lib</location> <location>C:/Development/42six/trunk/thirdparty/pasco2/lib</location>
</link> </link>
</linkedResources> </linkedResources>
<filteredResources>
<filter>
<id>1715884364848</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
<variableList> <variableList>
<variable> <variable>
<name>BIN_DIR</name> <name>BIN_DIR</name>