Merge pull request #285 from rabbitmq/erl_libs_contents-expand_ezs-fix

Fix an issue with erl_libs_contents function expand_ezs option

Author: HoloRin

private/escript_archive.bzl

@@ -1,8 +1,3 @@
-load(
-    "//tools:erlang_toolchain.bzl",
-    "erlang_dirs",
-    "maybe_install_erlang",
-)
 load(
     "//:erlang_app_info.bzl",
     "ErlangAppInfo",
@@ -12,6 +7,11 @@ load(
     "//:util.bzl",
     "path_join",
 )
+load(
+    "//tools:erlang_toolchain.bzl",
+    "erlang_dirs",
+    "maybe_install_erlang",
+)
 load(
     ":util.bzl",
     "additional_file_dest_relative_path",
@@ -40,34 +40,35 @@ def _impl(ctx):
                     archive_path = ""
                 else:
                     archive_path = path_join(lib_info.app_name, "ebin")
-            elif ctx.attr.flat:
-                archive_path = src.basename
             else:
-                archive_path = path_join(lib_info.app_name, "ebin", src.basename)
-            if archive_path in entries:
-                fail("Duplicate entry for", archive_path)
+                if ctx.attr.flat:
+                    archive_path = src.basename
+                else:
+                    archive_path = path_join(lib_info.app_name, "ebin", src.basename)
+                if archive_path in entries:
+                    fail("Duplicate entry for %s: '%s'" % (src, archive_path))
             entries[archive_path] = src
         for src in ([] if ctx.attr.drop_hrl else lib_info.include) + lib_info.priv:
-            rp = additional_file_dest_relative_path(dep.label, src)
             if ctx.attr.flat:
                 archive_path = src.basename
             else:
+                rp = additional_file_dest_relative_path(dep.label, src)
                 archive_path = path_join(lib_info.app_name, rp)
             if archive_path in entries:
-                fail("Duplicate entry for", archive_path)
+                fail("Duplicate entry for %s: '%s'" % (src, archive_path))
             entries[archive_path] = src
 
     commands = ["set -euo pipefail"]
     for dest, src in entries.items():
         full_dest = path_join(contents_dir.path, dest)
         commands.append('mkdir -p $(dirname "{}")'.format(full_dest))
         if src.is_directory:
-            commands.append("cp -r {src}/ {dest}".format(
+            commands.append('mkdir -p "{dest}" && cp -r "{src}"/* "{dest}"'.format(
                 src = src.path,
                 dest = full_dest,
             ))
         else:
-            commands.append("cp {src} {dest}".format(
+            commands.append('cp "{src}" "{dest}"'.format(
                 src = src.path,
                 dest = full_dest,
             ))

private/util.bzl

@@ -65,7 +65,7 @@ def erl_libs_contents(
         for src in lib_info.beam:
             if src.is_directory:
                 if len(lib_info.beam) != 1:
-                    fail("ErlangAppInfo.beam must be a collection of files, or a single ebin dir")
+                    fail("ErlangAppInfo.beam must be a collection of files, or a single ebin dir: {} {}".format(lib_info.app_name, lib_info.beam))
                 dest = ctx.actions.declare_directory(path_join(dep_path, "ebin"))
                 ctx.actions.run_shell(
                     inputs = [src],
@@ -89,7 +89,7 @@ def erl_libs_contents(
                 outputs = [dest],
                 command = "unzip -q {} -d {}".format(
                     ez.path,
-                    dest.path,
+                    dest.dirname,
                 ),
                 mnemonic = "RulesErlangCopyErlLibsExpandEz",
             )