real_path -> tilde_expand in cd. Also, fix tilde expansion of just pl…

…ain "~"
pwl · Aug 8, 2012 · b9441d1 · b9441d1
1 parent d3ba546
commit b9441d1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/base/file.jl b/base/file.jl
@@ -113,6 +113,9 @@ function tilde_expand(path::String)
  if m != nothing
  return ENV["HOME"]*path[2:end]
  end
+ if path == "~"
+ return ENV["HOME"]
+ end
  path
 end
 
@@ -181,7 +184,7 @@ function cwd()
  cstring(p)
 end
 
-cd(dir::String) = system_error("chdir", ccall(:chdir,Int32,(Ptr{Uint8},),real_path(dir)) == -1)
+cd(dir::String) = system_error("chdir", ccall(:chdir,Int32,(Ptr{Uint8},),tilde_expand(dir)) == -1)
 cd() = cd(ENV["HOME"])
 
 # do stuff in a directory, then return to current directory