From a80c43e7fa9beff689f05f378cb2f622de1f0006 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Tue, 23 May 2017 14:54:02 -0700
Subject: [PATCH] [tasks/lib/notice] join all notices with the same separator

---
 tasks/lib/notice/base_notice.txt    | 1 -
 tasks/lib/notice/notice.js          | 6 +++---
 tasks/lib/notice/packages_notice.js | 6 ++----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/tasks/lib/notice/base_notice.txt b/tasks/lib/notice/base_notice.txt
index 19f505cdfe61bff..13cb1a0121529b9 100644
--- a/tasks/lib/notice/base_notice.txt
+++ b/tasks/lib/notice/base_notice.txt
@@ -56,4 +56,3 @@ THE SOFTWARE.
 ---
 This product bundles geohash.js which is available under a
 "MIT" license.  For details, see src/ui/public/utils/decode_geo_hash.js.
----
diff --git a/tasks/lib/notice/notice.js b/tasks/lib/notice/notice.js
index 31047ec89d67136..dafe816ec2d7442 100644
--- a/tasks/lib/notice/notice.js
+++ b/tasks/lib/notice/notice.js
@@ -1,7 +1,7 @@
 import { resolve } from 'path';
 import { readFileSync } from 'fs';
 
-import { generatePackagesNoticeText } from './packages_notice';
+import { generatePackageNoticeTexts } from './packages_notice';
 import { generateNodeNoticeText } from './node_notice';
 
 const BASE_NOTICE = resolve(__dirname, './base_notice.txt');
@@ -22,7 +22,7 @@ export async function generateNoticeText(options = {}) {
   const { packages, nodeDir } = options;
   return [
     readFileSync(BASE_NOTICE, 'utf8'),
-    await generatePackagesNoticeText(packages),
+    ...(await generatePackageNoticeTexts(packages)),
     generateNodeNoticeText(nodeDir)
-  ].join('');
+  ].join('\n---\n');
 }
diff --git a/tasks/lib/notice/packages_notice.js b/tasks/lib/notice/packages_notice.js
index 47af7739cb61107..b6879cf8ce257aa 100644
--- a/tasks/lib/notice/packages_notice.js
+++ b/tasks/lib/notice/packages_notice.js
@@ -6,8 +6,8 @@ const concatNotices = notices => (
   notices.map(notice => notice.text).join('\n')
 );
 
-export async function generatePackagesNoticeText(packages) {
-  const noticeChunks = await asyncMap(packages, async pkg => {
+export async function generatePackageNoticeTexts(packages) {
+  return await asyncMap(packages, async pkg => {
     const bundledNotices = concatNotices(await getBundledNotices(pkg.directory));
 
     const intro = `This product bundles ${pkg.name}@${pkg.version}`;
@@ -23,6 +23,4 @@ export async function generatePackagesNoticeText(packages) {
 
     return `${intro}${license}${moreInfo}`;
   });
-
-  return noticeChunks.join('\n---\n');
 }