Move printing out of copy_path, always create dir

Signed-off-by: José Valim <[email protected]>

Author: José Valim

lib/mix/lib/mix/tasks/archive.install.ex

@@ -54,12 +54,12 @@ defmodule Mix.Tasks.Archive.Install do
     if opts[:force] || should_install?(src, previous) do
       remove_previous_versions(previous)
 
-      dest = Mix.Local.archives_path()
-      archive = Path.join(dest, basename(src))
+      archive = Path.join(Mix.Local.archives_path(), basename(src))
       check_file_exists(archive)
 
-      File.mkdir_p!(dest)
-      Mix.Utils.copy_path!(src, archive, opts)
+      if Mix.Utils.copy_path!(src, archive, opts) do
+        Mix.shell.info [:green, "* creating ", :reset, Path.relative_to_cwd(archive)]
+      end
 
       true = Code.append_path(Mix.Archive.ebin(archive))
     else

lib/mix/lib/mix/tasks/local.rebar.ex

@@ -30,10 +30,12 @@ defmodule Mix.Tasks.Local.Rebar do
 
   defp do_install(path, opts) do
     local_rebar_path = Mix.Rebar.local_rebar_path
-    File.mkdir_p! Path.dirname(local_rebar_path)
 
-    Mix.Utils.copy_path!(path, local_rebar_path, opts)
-    :ok = :file.change_mode local_rebar_path, 0o755
+    if Mix.Utils.copy_path!(path, local_rebar_path, opts) do
+      :ok = :file.change_mode local_rebar_path, 0o755
+      Mix.shell.info [:green, "* creating ", :reset, Path.relative_to_cwd(local_rebar_path)]
+    end
+
     true
   end
 end

lib/mix/lib/mix/utils.ex

@@ -368,9 +368,9 @@ defmodule Mix.Utils do
   def read_path!(path, opts \\ []) do
     cond do
       url?(path) && opts[:shell] ->
-        read_shell(path, [])
+        read_shell(path, nil)
       url?(path) ->
-        read_httpc(path, [])
+        read_httpc(path, nil)
       file?(path) ->
         read_file(path)
       true ->
@@ -395,23 +395,23 @@ defmodule Mix.Utils do
 
     * `:force` - Forces overwriting target file without a shell prompt.
   """
-  def copy_path!(source, target, opts \\ []) do
+  def copy_path!(source, target, opts \\ []) when is_binary(source) and is_binary(target) do
     if opts[:force] || overwriting?(target) do
       cond do
         url?(source) && opts[:shell] ->
-          read_shell(source, file: target)
+          read_shell(source, target)
         url?(source) ->
-          read_httpc(source, file: target)
+          read_httpc(source, target)
         file?(source) ->
           copy_file(source, target)
         true ->
           Mix.raise "Expected #{source} to be a url or a local file path"
       end
 
-      put_creating_file(target)
+      true
+    else
+      false
     end
-
-    :ok
   end
 
   @doc """
@@ -432,10 +432,11 @@ defmodule Mix.Utils do
   end
 
   defp copy_file(source, target) do
+    File.mkdir_p!(Path.dirname(target))
     File.cp!(source, target)
   end
 
-  defp read_httpc(path, opts) do
+  defp read_httpc(path, target) do
     {:ok, _} = Application.ensure_all_started(:ssl)
     {:ok, _} = Application.ensure_all_started(:inets)
 
@@ -452,9 +453,10 @@ defmodule Mix.Utils do
     if http_proxy,  do: proxy(http_proxy)
     if https_proxy, do: proxy(https_proxy)
 
-    if out_path = opts[:file] do
-      File.rm(out_path)
-      req_opts = [stream: String.to_char_list(out_path)]
+    if target do
+      File.mkdir_p!(Path.dirname(target))
+      File.rm(target)
+      req_opts = [stream: String.to_char_list(target)]
     else
       req_opts = [body_format: :binary]
     end
@@ -490,10 +492,11 @@ defmodule Mix.Utils do
     end
   end
 
-  defp read_shell(path, opts) do
+  defp read_shell(path, target) do
     filename = URI.parse(path).path |> Path.basename
-    out_path = opts[:file] || Path.join(System.tmp_dir!, filename)
+    out_path = target || Path.join(System.tmp_dir!, filename)
 
+    File.mkdir_p!(Path.dirname(out_path))
     File.rm(out_path)
 
     status = cond do
@@ -511,9 +514,9 @@ defmodule Mix.Utils do
         1
     end
 
-    check_command!(status, path, opts[:file])
+    check_command!(status, path, target)
 
-    unless opts[:file] do
+    unless target do
       data = File.read!(out_path)
       File.rm!(out_path)
       data
@@ -534,10 +537,6 @@ defmodule Mix.Utils do
     match?({:win32, _}, :os.type)
   end
 
-  defp put_creating_file(path) do
-    Mix.shell.info [:green, "* creating ", :reset, Path.relative_to_cwd(path)]
-  end
-
   defp file?(path) do
     File.regular?(path)
   end