Revert 6RiverSystems specific changes

* Added default old/new parameters back
* Update README instructions to point at original repo, not fork
* Replacements should not use a regex
* Add log message if default branch is not updated

Author: mheap

README.md

@@ -22,7 +22,7 @@ npm install -g github-default-branch
 ## Development
 
 ```shell
-git clone https://github.com/6RiverSystems/github-default-branch.git
+git clone https://github.com/mheap/github-default-branch.git
 cd github-default-branch
 npm ci
 ```
@@ -85,35 +85,33 @@ Like this:
 
 ```javascript
 module.exports = function ({
-    owner, // string - repo owner
-    repo, // string - repo name
-    old, // string - old branch name
-    target, // string - new branch name
-    octokit, // Octokit - oktokit instance
-    verbose, // boolean - verbose flag
-    isDryRun, // boolean - dry run flag
+  owner, // string - repo owner
+  repo, // string - repo name
+  old, // string - old branch name
+  target, // string - new branch name
+  octokit, // Octokit - oktokit instance
+  verbose, // boolean - verbose flag
+  isDryRun, // boolean - dry run flag
 }) {
-    // code goes here
-    return {
-        path: '<path to file in repo>',
-        replacements: [
-            {
-                from: '<from pattern>',
-                to: '<to pattern>',
-            },
-            {
-                from: '<from pattern>',
-                to: '<to pattern>',
-            },
-        ],
-    };
-}
-
+  // code goes here
+  return {
+    path: "<path to file in repo>",
+    replacements: [
+      {
+        from: "<from pattern>",
+        to: "<to pattern>",
+      },
+      {
+        from: "<from pattern>",
+        to: "<to pattern>",
+      },
+    ],
+  };
+};
 ```
 
 The file with the path in your repo will have any line matching `from` be swapped out with `to`
 
-
 ### Known Issues
 
 The replacement system gives you octokit, that's great! Unfortunately replacement functions do not currently support asynchronous calls, that's bad.

bin/github-default-branch

@@ -105,8 +105,8 @@
   const updateContent = require("../src/update-content");
   const updateBranchProtection = require("../src/branch-protection");
 
-  const old = argv.old;
-  const target = argv.new;
+  const old = argv.old || "master";
+  const target = argv.new || "main";
   const verbose = argv.verbose;
 
   // Make sure they want to do this
@@ -145,7 +145,7 @@
       currentMasterSha = await getBranchSha(owner, repo, old, octokit);
     } catch (e) {
       // Typically, this will fail when the old branch, i.e. master, doesn't exist.
-      console.log(`⚠️  Skipping ${r}: ${e.message}\n`)
+      console.log(`⚠️  Skipping ${r}: ${e.message}\n`);
       continue;
     }
 
@@ -154,13 +154,7 @@
     }
 
     if (!isDryRun) {
-      await createBranch(
-        owner,
-        repo,
-        target,
-        currentMasterSha,
-        octokit
-      );
+      await createBranch(owner, repo, target, currentMasterSha, octokit);
     }
 
     // List all PRs
@@ -205,16 +199,22 @@
       data: { default_branch: defaultBranch },
     } = await octokit.repos.get({
       owner,
-      repo
+      repo,
     });
 
-    if (!isDryRun && defaultBranch === old) {
-      // Update the default branch in the repo
-      await octokit.repos.update({
-        owner,
-        repo,
-        default_branch: target,
-      });
+    if (!isDryRun) {
+      if (defaultBranch === old) {
+        // Update the default branch in the repo
+        await octokit.repos.update({
+          owner,
+          repo,
+          default_branch: target,
+        });
+      } else {
+        console.log(
+          `✏️  Default branch is different to 'old' value. Not updating default branch`
+        );
+      }
     }
 
     if (verbose) {
@@ -244,7 +244,7 @@
       target,
       octokit,
       verbose,
-      isDryRun
+      isDryRun,
     });
 
     // Add an empty new line to break up the output for each repo

src/update-content.js

@@ -1,21 +1,17 @@
-const fs = require('fs');
-const util = require('util');
+const fs = require("fs");
+const util = require("util");
 const replaceAll = require("string.prototype.replaceall");
 
 const ls = util.promisify(fs.readdir);
 
 module.exports = async function (options) {
-  const {
-    owner,
-    repo,
-    octokit,
-    verbose,
-    isDryRun,
-  } = options;
+  const { owner, repo, octokit, verbose, isDryRun } = options;
   const replacementsDir = `${__dirname}/replacements`;
-  const files = (await ls(replacementsDir)).filter((f) => f.endsWith('.js'));
+  const files = (await ls(replacementsDir)).filter((f) => f.endsWith(".js"));
   const replacements = files.reduce((acc, next) => {
-    const { path, replacements } = require(`${replacementsDir}/${next}`)(options);
+    const { path, replacements } = require(`${replacementsDir}/${next}`)(
+      options
+    );
     return Object.assign(acc, { [path]: replacements });
   }, {});
   for (let path in replacements) {
@@ -24,23 +20,15 @@ module.exports = async function (options) {
 
       let content = file.content;
       for (let r of replacements[path]) {
-        const re = new RegExp(r.from, "g");
-        content = replaceAll(content, re, r.to);
+        content = replaceAll(content, r.from, r.to);
       }
 
       if (content !== file.content) {
         if (verbose) {
           console.log(`✏️  Updating [${path}]`);
         }
         if (!isDryRun) {
-          await writeFile(
-            owner,
-            repo,
-            path,
-            content,
-            file.sha,
-            octokit
-          );
+          await writeFile(owner, repo, path, content, file.sha, octokit);
         }
       } else {
         if (verbose) {