Index: src/org/jboss/tools/forge/runtime/ext/AllCommandsInterceptor.java =================================================================== --- src/org/jboss/tools/forge/runtime/ext/AllCommandsInterceptor.java (revision 41643) +++ src/org/jboss/tools/forge/runtime/ext/AllCommandsInterceptor.java (working copy) @@ -52,14 +52,23 @@ } private String handleWorkspaceShortCut(String str) { - if (str.startsWith("#")) { - return System.getProperty("forge.workspace") + str.substring(1); + String result = str; + if (str.startsWith("#")) { + result = encloseWithDoubleQuotesIfNeeded(System.getProperty("forge.workspace")) + str.substring(1); } - return str; + return result; } private void sendEscaped(String str) { shell.print(ESCAPE + str + ESCAPE); } + private static String encloseWithDoubleQuotesIfNeeded(String str) { + if (str.contains(" ")) { + return "\"" + str + "\""; + } else { + return str; + } + } + }