Updated Branches: refs/heads/master a65b584d1 -> 04d93ef0a
Use the user.home property instead of a bash thing. See http://docs.oracle.com/javase/tutorial/essential/environment/sysprop.html Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/04d93ef0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/04d93ef0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/04d93ef0 Branch: refs/heads/master Commit: 04d93ef0aafcbea363f23d365a33a1ce4efeacd4 Parents: a65b584 Author: Hugo Trippaers <[email protected]> Authored: Mon Jan 21 11:56:53 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Mon Jan 21 11:56:53 2013 +0100 ---------------------------------------------------------------------- .../com/cloud/server/ConfigurationServerImpl.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/04d93ef0/server/src/com/cloud/server/ConfigurationServerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index 74fba89..b0abd04 100755 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -553,8 +553,7 @@ public class ConfigurationServerImpl implements ConfigurationServer { return; } String already = _configDao.getValue("ssh.privatekey"); - String homeDir = null; - homeDir = Script.runSimpleBashScript("echo ~" + username); + String homeDir = System.getProperty("user.home"); if (homeDir == null) { throw new CloudRuntimeException("Cannot get home directory for account: " + username); }
