MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-116866 (path overriding for plugins/log dirs fixed)

Browse Source 
Comments in idea.properties updated to reflect the default.
This commit is contained in:
Roman Shevchenko
2013-11-27 21:14:45 +01:00
parent 8fd2f553ab
commit dc6be5b57f
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/idea.properties
+2 -2
View File
@@ -15,12 +15,12 @@
#---------------------------------------------------------------------
# Uncomment this option if you want to customize path to user installed plugins folder. Make sure you're using forward slashes.
#---------------------------------------------------------------------
# idea.plugins.path=${user.home}/.@@settings_dir@@/config/plugins
# idea.plugins.path=${idea.config.path}/plugins
#---------------------------------------------------------------------
# Uncomment this option if you want to customize path to IDE logs folder. Make sure you're using forward slashes.
#---------------------------------------------------------------------
# idea.log.path=${user.home}/.@@settings_dir@@/system/log
# idea.log.path=${idea.system.path}/log
#---------------------------------------------------------------------
# Maximum file size (kilobytes) IDE should provide code assistance for.
platform/util/src/com/intellij/openapi/application/PathManager.java
+6 -5
View File
@@ -79,7 +79,8 @@ public class PathManager {
else {
ourHomePath = getHomePathFor(PathManager.class);
if (ourHomePath == null) {
String advice = SystemInfo.isMac ? "reinstall the software." : "make sure bin/idea.properties is present in the installation directory.";
String advice = SystemInfo.isMac ? "reinstall the software."
: "make sure bin/idea.properties is present in the installation directory.";
throw new RuntimeException("Could not find installation home path. Please " + advice);
}
}
@@ -186,8 +187,8 @@ public class PathManager {
if (System.getProperty(PROPERTY_PLUGINS_PATH) != null) {
ourPluginsPath = getAbsolutePath(trimPathQuotes(System.getProperty(PROPERTY_PLUGINS_PATH)));
}
else if (PATHS_SELECTOR != null) {
ourPluginsPath = platformPath(PATHS_SELECTOR, "Library/Application Support", CONFIG_FOLDER + File.separatorChar + PLUGINS_FOLDER);
if (SystemInfo.isMac && PATHS_SELECTOR != null) {
ourPluginsPath = getUserHome() + File.separator + "Library/Application Support" + File.separator + PATHS_SELECTOR;
}
else {
ourPluginsPath = getConfigPath() + File.separatorChar + PLUGINS_FOLDER;
@@ -235,8 +236,8 @@ public class PathManager {
if (System.getProperty(PROPERTY_LOG_PATH) != null) {
ourLogPath = getAbsolutePath(trimPathQuotes(System.getProperty(PROPERTY_LOG_PATH)));
}
else if (PATHS_SELECTOR != null) {
ourLogPath = platformPath(PATHS_SELECTOR, "Library/Logs", SYSTEM_FOLDER + File.separatorChar + LOG_DIRECTORY);
else if (SystemInfo.isMac && PATHS_SELECTOR != null) {
ourLogPath = getUserHome() + File.separator + "Library/Logs" + File.separator + PATHS_SELECTOR;
}
else {
ourLogPath = getSystemPath() + File.separatorChar + LOG_DIRECTORY;