summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2013-07-30 13:07:14 +0100
committerEmile Joubert <emile@rabbitmq.com>2013-07-30 13:07:14 +0100
commite2f502dcebfef16beffd6f308d6471d2d47bee4d (patch)
treed392b69168c0feddf02ea03ee0ab29a7a472a880
parentd99108bf76d3ddb972683217ae3e3e62583d036c (diff)
downloadrabbitmq-server-e2f502dcebfef16beffd6f308d6471d2d47bee4d.tar.gz
Work around Clink shell issue
This shell fails to suppress its copyright banner if there is no space between "/c" and the rest of the commandline.
-rw-r--r--src/rabbit_control_main.erl2
-rw-r--r--src/rabbit_disk_monitor.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl
index f5e70365..c195ace5 100644
--- a/src/rabbit_control_main.erl
+++ b/src/rabbit_control_main.erl
@@ -602,7 +602,7 @@ process_up(Pid) ->
run_ps(Pid) =:= 0
end},
{win32, fun () ->
- Res = os:cmd("tasklist /nh /fi \"pid eq " ++
+ Res = os:cmd(" tasklist /nh /fi \"pid eq " ++
Pid ++ "\" 2>&1"),
case re:run(Res, "erl\\.exe", [{capture, none}]) of
match -> true;
diff --git a/src/rabbit_disk_monitor.erl b/src/rabbit_disk_monitor.erl
index 3bb163a1..0e2c9ca1 100644
--- a/src/rabbit_disk_monitor.erl
+++ b/src/rabbit_disk_monitor.erl
@@ -168,7 +168,7 @@ get_disk_free(Dir, {unix, Sun})
get_disk_free(Dir, {unix, _}) ->
parse_free_unix(rabbit_misc:os_cmd("/bin/df -kP " ++ Dir));
get_disk_free(Dir, {win32, _}) ->
- parse_free_win32(os:cmd("dir /-C /W \"" ++ Dir ++ [$"]));
+ parse_free_win32(os:cmd(" dir /-C /W \"" ++ Dir ++ [$"]));
get_disk_free(_, Platform) ->
{unknown, Platform}.