Merge pull request #20494 from JuliaLang/sk/shellmode

eliminate REPL shell mode deprecation warnings
JuliaLang · Feb 8, 2017 · b8c21cf · b8c21cf
2 parents 407985b + 35aa4f1
commit b8c21cf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/base/REPL.jl b/base/REPL.jl
@@ -742,7 +742,7 @@ function setup_interface(repl::LineEditREPL; hascolor = repl.hascolor, extra_rep
         # and pass into Base.repl_cmd for processing (handles `ls` and `cd`
         # special)
         on_done = respond(repl, julia_prompt) do line
-            Expr(:call, :(Base.repl_cmd), macroexpand(Expr(:macrocall, Symbol("@cmd"),line)), outstream(repl))
+            Expr(:call, :(Base.repl_cmd), Cmd(Base.shell_split(line)), outstream(repl))
         end)
 
 

diff --git a/base/shell.jl b/base/shell.jl
@@ -127,7 +127,7 @@ end
 
 function shell_split(s::AbstractString)
     parsed = shell_parse(s, false)[1]
-    args = AbstractString[]
+    args = String[]
     for arg in parsed
        push!(args, string(arg...))
     end

diff --git a/test/repl.jl b/test/repl.jl
@@ -100,6 +100,13 @@ if !is_windows() || Sys.windows_version() >= Sys.WINDOWS_VISTA_VER
     end
     cd(origpwd)
 
+    # issue #20482
+    write(stdin_write, ";")
+    readuntil(stdout_read, "shell> ")
+    write(stdin_write, "echo hello >/dev/null\n")
+    readuntil(stdout_read, "\n")
+    readuntil(stdout_read, "\n")
+
     # Test that accepting a REPL result immediately shows up, not
     # just on the next keystroke
     write(stdin_write, "1+1\n") # populate history with a trivial input