From 26544461b862d407b6194ec29287deaf86c912f6 Mon Sep 17 00:00:00 2001 From: nsingh Date: Mon, 23 Jan 2017 13:21:53 -0800 Subject: [PATCH] Allow CF CLI config check on all OS --- .../client/cftarget/CfCliParamsProvider.java | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliParamsProvider.java b/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliParamsProvider.java index 20ede362b..4ad5ca7d0 100644 --- a/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliParamsProvider.java +++ b/vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CfCliParamsProvider.java @@ -86,24 +86,21 @@ public class CfCliParamsProvider implements ClientParamsProvider { } private File getConfigJsonFile() throws IOException, InterruptedException { - // Support Unix systems for now - if (!System.getProperty("os.name").toLowerCase().startsWith("win")) { - String homeDir = getUnixHomeDir(); - if (homeDir != null) { - if (!homeDir.endsWith("/")) { - homeDir += '/'; - } - String filePath = homeDir + ".cf/config.json"; - File file = new File(filePath); - if (file.exists() && file.canRead()) { - return file; - } + String homeDir = getHomeDir(); + if (homeDir != null) { + if (!homeDir.endsWith("/")) { + homeDir += '/'; + } + String filePath = homeDir + ".cf/config.json"; + File file = new File(filePath); + if (file.exists() && file.canRead()) { + return file; } } return null; } - private String getUnixHomeDir() throws IOException, InterruptedException { + private String getHomeDir() throws IOException, InterruptedException { return System.getProperty("user.home"); }