fix: Fixed installer not notarized properly

Author: kevinwang5658

package.json

@@ -145,7 +145,7 @@
     "deploy": "npm run pkg && npm run notarize && npm run upload",
     "prepublishOnly": "npm run build"
   },
-  "version": "1.0.1",
+  "version": "1.0.2",
   "bugs": "https://github.com/codifycli/codify/issues",
   "keywords": [
     "oclif",

scripts/notarize.sh

@@ -3,7 +3,7 @@ for filename in ./.build/dist/macos/*.pkg; do
   echo "Uploading and notarizing $filename with Apple... (5-10 minutes)"
   RESULT=$(
     xcrun notarytool submit $filename \
-    --keychain-profile "notarytool-password" \
+    --keychain-profile "notary-tool" \
     --wait \
     -f json
   )
@@ -12,7 +12,7 @@ for filename in ./.build/dist/macos/*.pkg; do
   echo $RESULT
 
   SUBMISSION_ID=$(jq -r '.id' <<< $RESULT)
-  xcrun notarytool log $SUBMISSION_ID --keychain-profile "notarytool-password"
+  xcrun notarytool log $SUBMISSION_ID --keychain-profile "notary-tool"
 
   echo "Stapling notary to $filename"
   xcrun stapler staple $filename

scripts/pkg.ts

@@ -54,21 +54,22 @@ async function ignoreError(fn: () => Promise<any> | any): Promise<void> {
 
 // Oclif has a bug where the installer doesn't clear out the auto-updater location. This causes older versions
 // to be re-used even with a clean install
+// Comment this out because it does not work with MacOS notary tool. It fails verification
 async function patchMacOsInstallers() {
-  console.log(chalk.magenta('Patching MacOS installers with bug fix'))
-
-  const pkgFolder = './.build/dist/macos';
-  const files = await fs.readdir(pkgFolder)
-  const pkgFiles = files.filter((name) => name.endsWith('.pkg'))
-
-  for (const pkgFile of pkgFiles) {
-    const pkgPath = path.join(pkgFolder, pkgFile);
-    const tmpPath = path.join(pkgFolder, 'tmp');
-
-    execSync(`pkgutil --expand ${pkgPath} ${tmpPath}`)
-    await fs.appendFile(path.join(tmpPath, 'Scripts', 'preinstall'), '\nsudo rm -rf ~/.local/share/codify', 'utf8');
-    execSync(`pkgutil --flatten ${tmpPath} ${pkgPath} `)
-    execSync(`rm -rf ${tmpPath}`);
-    console.log(chalk.magenta(`Done patching installer ${pkgFile}`))
-  }
+  // console.log(chalk.magenta('Patching MacOS installers with bug fix'))
+  //
+  // const pkgFolder = './.build/dist/macos';
+  // const files = await fs.readdir(pkgFolder)
+  // const pkgFiles = files.filter((name) => name.endsWith('.pkg'))
+  //
+  // for (const pkgFile of pkgFiles) {
+  //   const pkgPath = path.join(pkgFolder, pkgFile);
+  //   const tmpPath = path.join(pkgFolder, 'tmp');
+  //
+  //   execSync(`pkgutil --expand ${pkgPath} ${tmpPath}`)
+  //   await fs.appendFile(path.join(tmpPath, 'Scripts', 'preinstall'), '\nsudo rm -rf ~/.local/share/codify', 'utf8');
+  //   execSync(`pkgutil --flatten ${tmpPath} ${pkgPath} `)
+  //   execSync(`rm -rf ${tmpPath}`);
+  //   console.log(chalk.magenta(`Done patching installer ${pkgFile}`))
+  // }
 }