From bddcb80c4e59a6c73952a72ce830c2e3bba9c466 Mon Sep 17 00:00:00 2001 From: Kai Cataldo Date: Mon, 27 Apr 2020 15:55:55 -0400 Subject: [PATCH 1/3] Chore: fix rules list for prereleases --- Makefile.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.js b/Makefile.js index a574f25d9a9..29d2f2547cf 100644 --- a/Makefile.js +++ b/Makefile.js @@ -613,7 +613,6 @@ target.gensite = function(prereleaseVersion) { htmlFullPath = fullPath.replace(".md", ".html"); if (test("-f", fullPath)) { - rm("-rf", fullPath); if (filePath.indexOf(".md") >= 0 && test("-f", htmlFullPath)) { @@ -743,7 +742,7 @@ target.gensite = function(prereleaseVersion) { echo(`> Updating files (Steps 4-9)${" ".repeat(50)}`); // 10. Copy temporary directory to site's docs folder - echo("> Copying the temporary directory the site (Step 10)"); + echo("> Copying the temporary directory into the site's docs folder (Step 10)"); let outputDir = DOCS_DIR; if (prereleaseVersion) { @@ -756,7 +755,11 @@ target.gensite = function(prereleaseVersion) { // 11. Generate rule listing page echo("> Generating the rule listing (Step 11)"); - generateRuleIndexPage(); + + if (!prereleaseVersion) { + echo("> Skipping updating rules listing page because this is a prerelease."); + generateRuleIndexPage(); + } // 12. Delete temporary directory echo("> Removing the temporary directory (Step 12)"); From ba110b1b984c761949a70e1ea0567687434ad63f Mon Sep 17 00:00:00 2001 From: Kai Cataldo Date: Tue, 28 Apr 2020 12:51:29 -0400 Subject: [PATCH 2/3] Fix logs --- Makefile.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.js b/Makefile.js index 29d2f2547cf..7a8ce236aec 100644 --- a/Makefile.js +++ b/Makefile.js @@ -754,10 +754,10 @@ target.gensite = function(prereleaseVersion) { cp("-rf", `${TEMP_DIR}*`, outputDir); // 11. Generate rule listing page - echo("> Generating the rule listing (Step 11)"); - - if (!prereleaseVersion) { - echo("> Skipping updating rules listing page because this is a prerelease."); + if (prereleaseVersion) { + echo("> Skipping updating rules listing because this is a prerelease (Step 11)"); + } else { + echo("> Generating the rule listing (Step 11)"); generateRuleIndexPage(); } From 2946105bcc49af8008deef80e7d671c46dda8b05 Mon Sep 17 00:00:00 2001 From: Kai Cataldo Date: Tue, 28 Apr 2020 12:52:54 -0400 Subject: [PATCH 3/3] rules listing -> rules index page --- Makefile.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.js b/Makefile.js index 7a8ce236aec..3434cdca9cc 100644 --- a/Makefile.js +++ b/Makefile.js @@ -753,11 +753,11 @@ target.gensite = function(prereleaseVersion) { } cp("-rf", `${TEMP_DIR}*`, outputDir); - // 11. Generate rule listing page + // 11. Generate rules index page if (prereleaseVersion) { - echo("> Skipping updating rules listing because this is a prerelease (Step 11)"); + echo("> Skipping generating rules index page because this is a prerelease (Step 11)"); } else { - echo("> Generating the rule listing (Step 11)"); + echo("> Generating the rules index page (Step 11)"); generateRuleIndexPage(); }