From 81b07dd6f58ca020c82175bf3dded16c8c7ac054 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Wed, 23 Dec 2020 14:45:53 -0800
Subject: [PATCH] ;Shake changelogs: reduce excessive whitespace

(cherry picked from commit 7b13778a29f4e4959077ccaa1186ebe57454ff22)
---
 Shake.hs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/Shake.hs b/Shake.hs
index 2b6c814d0..05878a4cb 100755
--- a/Shake.hs
+++ b/Shake.hs
@@ -90,7 +90,6 @@ usage =
   ,"Add -B, with nothing immediately after it, to force rebuilding."
   ]
 -- TODO
---  changelogs: too many blank lines after final heading
 --  ,"./Shake releasebranch      create a new release branch, bump master to next dev version (.99)" 
 --  ,"./Shake majorversion       bump to the next major version project-wide, update affected files"
 --  ,"./Shake minorversion PKGS  bump one or more packages to their next minor version project-wide, update affected files"
@@ -665,13 +664,12 @@ main = do
             (newrev, newheading)
               | isNewRelease packageversion = (toTag packageversion, unwords [packageversion, show date])
               | otherwise                   = (headrev, headrev)
-            newcontent = "# "++newheading++"\n\n" ++ newitems
-            newchangelog = unlines $ concat [
-               preamble
-              ,[newcontent]
-              ,if isCommitHash changelogversion then [] else [oldheading]
-              ,rest
-              ]
+            newcontent = "# "++newheading++"\n" ++ newitems
+            newchangelog =
+                 unlines preamble
+              ++ newcontent
+              ++ (if isCommitHash changelogversion then "" else oldheading)
+              ++ unlines rest
 
           liftIO $ if
             | lastrev == newrev -> pure ()  -- putStrLn $ out ++ ": up to date"