X-Git-Url: http://git.megacz.com/?p=org.ibex.xt-crawshaw.git;a=blobdiff_plain;f=src%2Fjava%2Forg%2Fibex%2Fxt%2Fshell%2FEnv.java;fp=src%2Fjava%2Forg%2Fibex%2Fxt%2Fshell%2FEnv.java;h=f09cc95d5b55d665066dfd65cc18d587f6796c2a;hp=6f3714673c5ee4b09e887f1821c0e5cd890b0caf;hb=6430dcd3c8bf58a04a370614e375a74f5f2dce8b;hpb=fc9f528e7acb1baf7c145b22dd0b6469968aaec0 diff --git a/src/java/org/ibex/xt/shell/Env.java b/src/java/org/ibex/xt/shell/Env.java index 6f37146..f09cc95 100644 --- a/src/java/org/ibex/xt/shell/Env.java +++ b/src/java/org/ibex/xt/shell/Env.java @@ -17,14 +17,14 @@ public abstract class Env { /** Returns a path, based on console-style representation. */ public String path(String c) { - if (c.equals("") || c.equals(".") || c.equals("/")) { + if (c.equals("") || c.equals(".")) { c = "."; } else if (c.equals("..")) { + c = path; c = c.substring(0, c.lastIndexOf('.')); if (c.equals("")) c = "."; } else { - if (c.charAt(0) != '/') c = path + "." + c; - c = c.replaceAll("/+", "."); + if (c.charAt(0) != '.') c = path + "." + c; if (c.length() > 1 && c.charAt(c.length() - 1) == '.') c = c.substring(0, c.length() - 1); }