From 4f0204aee36809a85974528eb874183e6fc7d22e Mon Sep 17 00:00:00 2001
From: dragonwocky <thedragonring.bod@gmail.com>
Date: Tue, 28 Dec 2021 02:31:44 +1100
Subject: [PATCH] make --patch available, remove cli sign

---
 bin.mjs       | 12 ++----------
 insert/repo   |  2 +-
 pkg/apply.mjs |  4 ++--
 pkg/cli.mjs   |  8 ++++++--
 pkg/sign.mjs  | 28 ----------------------------
 5 files changed, 11 insertions(+), 43 deletions(-)
 delete mode 100644 pkg/sign.mjs

diff --git a/bin.mjs b/bin.mjs
index a504621..ed3e2f1 100755
--- a/bin.mjs
+++ b/bin.mjs
@@ -37,7 +37,6 @@ const displayHelp = () => {
       ['apply', 'add enhancements to the notion app'],
       ['remove', 'return notion to its pre-enhanced/pre-modded state'],
       ['check, status', 'check the current state of the notion app'],
-      ['sign', '[macos only] fix the "you do not have permission to open this app" error'],
     ],
     options: [
       ['-y, --yes', 'skip prompts'],
@@ -48,6 +47,7 @@ const displayHelp = () => {
         'provide a file location to enhance (otherwise auto-picked)',
       ],
       ['--no-backup', 'skip backup (faster enhancement, but disables removal)'],
+      ['--patch', 'overwrite inserted files (useful for quick development/testing)'],
       ['-h, --help', 'display usage information'],
       ['-v, --version', 'display version number'],
     ],
@@ -105,8 +105,8 @@ try {
       log`{bold.rgb(245,245,245) [NOTION-ENHANCER] APPLY}`;
       const res = await apply(notionPath, {
         overwritePrevious: promptRes,
+        patchPrevious: opts.get('patch') ? true : false,
         takeBackup: opts.get('no-backup') ? false : true,
-        applyDevPatch: opts.get('dev-patch') ? true : false,
       });
       if (res) {
         log`{bold.rgb(245,245,245) SUCCESS} {green ✔}`;
@@ -135,14 +135,6 @@ try {
       }
       break;
     }
-    case 'sign': {
-      log`{bold.rgb(245,245,245) [NOTION-ENHANCER] SIGN}`;
-      const res = await sign(notionPath);
-      if (res) {
-        log`{bold.rgb(245,245,245) SUCCESS} {green ✔}`;
-      } else log`{bold.rgb(245,245,245) CANCELLED} {red ✘}`;
-      break;
-    }
     default:
       displayHelp();
   }
diff --git a/insert/repo b/insert/repo
index 357cabe..ca25ae1 160000
--- a/insert/repo
+++ b/insert/repo
@@ -1 +1 @@
-Subproject commit 357cabe8657fddd53ca2ebdddbf4a64c833153ad
+Subproject commit ca25ae14aa61a31deedb2c6a97f72ad7e1ce1996
diff --git a/pkg/apply.mjs b/pkg/apply.mjs
index 340941d..b51f6a8 100644
--- a/pkg/apply.mjs
+++ b/pkg/apply.mjs
@@ -17,7 +17,7 @@ import remove from './remove.mjs';
 
 export default async function (
   notionFolder = findNotion(),
-  { overwritePrevious = undefined, takeBackup = true, applyDevPatch = false } = {}
+  { overwritePrevious = undefined, patchPrevious = false, takeBackup = true } = {}
 ) {
   let status = check(notionFolder);
   switch (status.code) {
@@ -26,7 +26,7 @@ export default async function (
     case 1: // corrupted
       throw Error(status.message);
     case 2: // same version already applied
-      if (!applyDevPatch) {
+      if (!patchPrevious) {
         log`  {grey * notion-enhancer v${status.version} already applied}`;
         return true;
       }
diff --git a/pkg/cli.mjs b/pkg/cli.mjs
index 37518a2..08d21a8 100644
--- a/pkg/cli.mjs
+++ b/pkg/cli.mjs
@@ -125,8 +125,12 @@ export const help = ({
   if (version) version = ' v' + version;
   const cmdPad = Math.max(...commands.map((cmd) => cmd[0].length)),
     optPad = Math.max(...options.map((opt) => opt[0].length));
-  commands = commands.map((cmd) => `  ${cmd[0].padEnd(cmdPad)}  :  ${cmd[1]}`).join('\n');
-  options = options.map((opt) => `  ${opt[0].padEnd(optPad)}  :  ${opt[1]}`).join('\n');
+  commands = commands
+    .map((cmd) => `  ${cmd[0].padEnd(cmdPad)}  ${chalk`{grey :}`}  ${cmd[1]}`)
+    .join('\n');
+  options = options
+    .map((opt) => `  ${opt[0].padEnd(optPad)}  ${chalk`{grey :}`}  ${opt[1]}`)
+    .join('\n');
   log`{bold.rgb(245,245,245) ${name}${version}}`;
   if (link) log`{grey ${link}}`;
   log`\n{bold.rgb(245,245,245) USAGE}`;
diff --git a/pkg/sign.mjs b/pkg/sign.mjs
deleted file mode 100644
index 3ce0f41..0000000
--- a/pkg/sign.mjs
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * notion-enhancer
- * (c) 2021 dragonwocky <thedragonring.bod@gmail.com> (https://dragonwocky.me/)
- * (https://notion-enhancer.github.io/) under the MIT license
- */
-
-import { log } from './cli.mjs';
-import { findNotion } from './helpers.mjs';
-import { execSync } from 'child_process';
-
-import check from './check.mjs';
-
-export default async function (notionFolder = findNotion()) {
-  const status = check(notionFolder);
-  if (process.platform === 'darwin') {
-    log`  {grey * app re-signing is only available on macos: exiting}`;
-    return false;
-  }
-
-  if (status.code > 1 && status.executable) {
-    log`  {grey * installing xcode cli tools}`;
-    execSync('xcode-select --install');
-    log`  {grey * codesigning app directory}`;
-    execSync(`codesign --force --deep --sign - ${status.installation}`);
-  } else log`  {grey * enhancements not found: skipping}`;
-
-  return true;
-}