From 74e864462faa6c7641e1b422673c3909be8f9b62 Mon Sep 17 00:00:00 2001 From: Constantine Plotnikov Date: Thu, 17 Jun 2010 11:14:52 +0400 Subject: [PATCH] IDEA-55587 HOME is now used for key location and known_hosts as well --- .../src/org/jetbrains/git4idea/ssh/SSHConfig.java | 2 +- .../src/org/jetbrains/git4idea/ssh/SSHMain.java | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/SSHConfig.java b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/SSHConfig.java index 36c99fa84d82..14c4b3b65822 100644 --- a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/SSHConfig.java +++ b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/SSHConfig.java @@ -36,7 +36,7 @@ public class SSHConfig { /** * User home directory */ - @NonNls private final static String USER_HOME; + @NonNls public final static String USER_HOME; static { String e = System.getenv("HOME"); diff --git a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/SSHMain.java b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/SSHMain.java index e49178d01e19..0f95cb7ee2f1 100644 --- a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/SSHMain.java +++ b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/SSHMain.java @@ -66,22 +66,18 @@ public class SSHMain { * The last error */ private String myLastError = ""; - /** - * user directory - */ - @NonNls private static final String userDir = System.getProperty("user.home"); /** * Path to known hosts file */ - @NonNls private static final String knownHostPath = userDir + "/.ssh/known_hosts"; + @NonNls private static final String knownHostPath = SSHConfig.USER_HOME + "/.ssh/known_hosts"; /** * Path to DSA key */ - @NonNls private static final String idDSAPath = userDir + "/.ssh/id_dsa"; + @NonNls private static final String idDSAPath = SSHConfig.USER_HOME + "/.ssh/id_dsa"; /** * Path to RSA key */ - @NonNls private static final String idRSAPath = userDir + "/.ssh/id_rsa"; + @NonNls private static final String idRSAPath = SSHConfig.USER_HOME + "/.ssh/id_rsa"; /** * database of known hosts