Fixing.

brave · Nov 28, 2024 · df30b67 · df30b67
1 parent 65c17e0
commit df30b67
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/lib/contentSign.js b/lib/contentSign.js
@@ -12,15 +12,24 @@ const getComponentFiles = (dir, patterns) => {
     cwd: dir,
     posix: true
   }
-  const files = glob.sync(patterns, options)
-  return files
-    .map((f) => {
-      return path.join(dir, f)
-    })
-    .filter((f) => {
-      return !fs.statSync(f).isDirectory()
-    })
-    .sort()
+  let files = []
+
+  patterns.forEach((pattern) => {
+    const pfiles = glob.sync('./' + pattern)
+    files = files.concat(pfiles)
+  })
+  files = [
+    ...new Set(
+      files
+        .map((f) => {
+          return path.join(dir, f)
+        })
+        .filter((f) => {
+          return !fs.statSync(f).isDirectory()
+        })
+    )
+  ]
+  return files.sort()
 }
 
 const computeBlockHashes = (filePath) => {
@@ -125,6 +134,11 @@ const createVerifiedContents = (
     throw new Error('Missing private key')
   }
 
+  privateKey = fs.readFileSync(privateKey, 'utf-8')
+  if (!privateKey) {
+    throw new Error('Cannot read private key')
+  }
+
   inputDir = ensureTrailingSlash(inputDir)
 
   const componentFiles = getComponentFiles(inputDir, patterns)

diff --git a/scripts/packageAdBlock.js b/scripts/packageAdBlock.js
@@ -20,7 +20,7 @@ async function stageFiles (version, outputDir) {
   util.copyManifestWithVersion(originalManifest, outputDir, version)
 }
 
-const generateVerifiedContents = (stagingDir, id, signingKey) => {
+const generateVerifiedContents = (stagingDir, signingKey) => {
   util.generateVerifiedContents(
     stagingDir,
     ['resources.json', 'list.txt', 'list_catalog.json'],
@@ -40,7 +40,7 @@ const postNextVersionWork = (componentSubdir, key, publisherProofKey,
       fs.unlinkSync(contentHashFile)
     }
     if (!localRun) {
-      generateVerifiedContents(stagingDir, componentSubdir, verifiedContentsKey)
+      generateVerifiedContents(stagingDir, verifiedContentsKey)
       const privateKeyFile = path.join(key, `ad-block-updater-${componentSubdir}.pem`)
       util.generateCRXFile(binary, crxFile, privateKeyFile, publisherProofKey,
         publisherProofKeyAlt, stagingDir)
@@ -104,7 +104,7 @@ const processComponent = (
     })
   } else {
     postNextVersionWork(componentSubdir, undefined, publisherProofKey,
-      publisherProofKeyAlt, binary, localRun, '1.0.0', contentHash)
+      publisherProofKeyAlt, binary, localRun, '1.0.0', contentHash, verifiedContentsKey)
   }
 }