Skip to content

Commit 482def8

Browse files
shell_parse usage: escape characters that will soon be special
1 parent 3b4491e commit 482def8

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

base/managers.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,10 @@ function launch_on_machine(manager::SSHManager, machine, cnt, params, launched,
179179

180180
# the default worker timeout
181181
tval = haskey(ENV, "JULIA_WORKER_TIMEOUT") ?
182-
`export JULIA_WORKER_TIMEOUT=$(ENV["JULIA_WORKER_TIMEOUT"]);` : ``
182+
`export JULIA_WORKER_TIMEOUT=$(ENV["JULIA_WORKER_TIMEOUT"])\;` : ``
183183

184184
# Julia process with passed in command line flag arguments
185-
cmd = `cd $dir && $tval $exename $exeflags`
185+
cmd = `cd $dir '&&' $tval $exename $exeflags`
186186

187187
# shell login (-l) with string command (-c) to launch julia process
188188
cmd = `sh -l -c $(shell_escape(cmd))`

test/replcompletions.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ for (T, arg) in [(String,"\")\""),(Char, "')'")]
289289
@test s[r] == "CompletionFoo.test2"
290290
end
291291

292-
s = "(1, CompletionFoo.test2(`)`,"
292+
s = "(1, CompletionFoo.test2(`')'`,"
293293
c, r, res = test_complete(s)
294294
@test c[1] == string(first(methods(Main.CompletionFoo.test2, Tuple{Cmd})))
295295
@test length(c) == 1

test/spawn.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ end
3232

3333
#### Examples used in the manual ####
3434

35-
@test readstring(`$echo hello | sort`) == "hello | sort\n"
35+
@test readstring(`$echo hello \| sort`) == "hello | sort\n"
3636
@test readstring(pipeline(`$echo hello`, sortcmd)) == "hello\n"
3737
@test length(spawn(pipeline(`$echo hello`, sortcmd)).processes) == 2
3838

0 commit comments

Comments
 (0)