summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2019-11-05 13:12:09 +0100
committerJosé Valim <jose.valim@plataformatec.com.br>2019-11-05 13:12:09 +0100
commitb293e29c5f4f2b4f427d0cdf585e68e06f414627 (patch)
tree1b8e378bb20b572c3718c778b49abfe07dd9aebc
parent3d279546abd92adcab9580d23d482c4d6abbbdc4 (diff)
downloadelixir-b293e29c5f4f2b4f427d0cdf585e68e06f414627.tar.gz
Remove prompts and run the formatter
-rw-r--r--lib/mix/lib/mix/local/installer.ex10
-rw-r--r--lib/mix/lib/mix/tasks/local.rebar.ex2
-rw-r--r--lib/mix/lib/mix/utils.ex13
3 files changed, 13 insertions, 12 deletions
diff --git a/lib/mix/lib/mix/local/installer.ex b/lib/mix/lib/mix/local/installer.ex
index 648e7dab5..2fe638a14 100644
--- a/lib/mix/lib/mix/local/installer.ex
+++ b/lib/mix/lib/mix/local/installer.ex
@@ -122,25 +122,25 @@ defmodule Mix.Local.Installer do
Please download the file above to your current directory and run:
- $ mix #{task(module)} ./#{basename}
+ mix #{task(module)} ./#{basename}
You can download it either with your browser or via the command line.
On Unix (Linux, MacOS X):
- $ wget #{src}
+ wget #{src}
or
- $ curl -o #{basename} #{src}
+ curl -o #{basename} #{src}
Windows (Win7 or later):
- > powershell -Command "Invoke-WebRequest #{src} -OutFile #{basename}"
+ powershell -Command "Invoke-WebRequest #{src} -OutFile #{basename}"
or
- > powershell -Command "(New-Object Net.WebClient).DownloadFile('#{src}', '#{basename}')"
+ powershell -Command "(New-Object Net.WebClient).DownloadFile('#{src}', '#{basename}')"
""")
end
diff --git a/lib/mix/lib/mix/tasks/local.rebar.ex b/lib/mix/lib/mix/tasks/local.rebar.ex
index 6bce3a85b..e043663a4 100644
--- a/lib/mix/lib/mix/tasks/local.rebar.ex
+++ b/lib/mix/lib/mix/tasks/local.rebar.ex
@@ -92,7 +92,7 @@ defmodule Mix.Tasks.Local.Rebar do
Please download the file above manually to your current directory and run:
- $ mix local.rebar #{manager} ./#{Path.basename(local)}
+ mix local.rebar #{manager} ./#{Path.basename(local)}
""")
end
end
diff --git a/lib/mix/lib/mix/utils.ex b/lib/mix/lib/mix/utils.ex
index a706c2a50..e0f1bd2d9 100644
--- a/lib/mix/lib/mix/utils.ex
+++ b/lib/mix/lib/mix/utils.ex
@@ -523,12 +523,13 @@ defmodule Mix.Utils do
def read_path(path, opts \\ []) do
cond do
url?(path) ->
- task = Task.async(fn ->
- with :ok <- require_checksum(opts),
- {:ok, binary} <- read_httpc(path) do
- checksum(binary, opts)
- end
- end)
+ task =
+ Task.async(fn ->
+ with :ok <- require_checksum(opts),
+ {:ok, binary} <- read_httpc(path) do
+ checksum(binary, opts)
+ end
+ end)
timeout = Keyword.get(opts, :timeout, 60_000)