GP-4358: No longer using XDG_RUNTIME_DIR for temp directory. Ubuntu

defaults it to a too small tmpfs. (Closes #6233)
This commit is contained in:
Ryan Kurtz 2024-02-23 08:12:36 -05:00
parent 2ce8463657
commit c5bad0a88f
3 changed files with 4 additions and 10 deletions

View file

@ -246,7 +246,9 @@ public class AppCleaner implements GhidraLaunchable {
getDirFromProperty(PROPERTY_TEMP_DIR, appName).ifPresent(discoveredDirs::add);
getDirFromProperty(PROPERTY_TEMP_DIR, userNameAndAppName).ifPresent(discoveredDirs::add);
// XDG environment variable override
// XDG environment variable override.
// This was used briefly in the master branch and then removed, so some users might have
// this artifact. We can eventually stop looking here.
getDirFromEnv(XDG_RUNTIME_DIR, appName).ifPresent(discoveredDirs::add);
getDirFromEnv(XDG_RUNTIME_DIR, userNameAndAppName).ifPresent(discoveredDirs::add);

View file

@ -176,13 +176,6 @@ public class ApplicationUtilities {
new File(tempOverrideDir, getUserSpecificDirName(tempOverrideDir, appName)));
}
// Look for XDG environment variable
File xdgRuntimeDir = getEnvFile(XdgUtils.XDG_RUNTIME_DIR, false);
if (xdgRuntimeDir != null) {
return createDir(
new File(xdgRuntimeDir, getUserSpecificDirName(xdgRuntimeDir, appName)));
}
File javaTmpDir = getJavaTmpDir();
return createDir(new File(getJavaTmpDir(), getUserSpecificDirName(javaTmpDir, appName)));
}