Remove force rms and dependency on ncp

[rbdr/blog] / lib / archivers / gemlog.js

diff --git a/lib/archivers/gemlog.js b/lib/archivers/gemlog.js
index 50bb33407c7da12fc2f0356c9eb3af15d188c670..3e08be4de7ad4de6bfcd5b08f5ac6c14466a75f4 100644 (file)
--- a/lib/archivers/gemlog.js
+++ b/lib/archivers/gemlog.js
@@ -1,14 +1,13 @@
-const { mkdir, readdir, rm, writeFile } = require('fs/promises');
-const { debuglog, promisify } = require('util');
-const { ncp } = require('ncp');
+const { cp, mkdir, readdir, writeFile } = require('fs/promises');
+const { debuglog } = require('util');
 const { resolve, join } = require('path');
+const { rmIfExists } = require('../utils');
 
 const internals = {
   kArchiveName: resolve(join(__dirname, '../..', '.gemlog')),
   kIndexName: 'index.gmi',
   kGeminiRe: /\.gmi$/i,
 
-  ncp: promisify(ncp),
   debuglog: debuglog('blog'),
 
   buildUrl(id, slug) {
@@ -53,7 +52,7 @@ module.exports = async function(archiveDirectory) {
 
   try {
     internals.debuglog('Removing index');
-    await rm(internals.kArchiveName, { recursive: true });
+    await rmIfExists(internals.kArchiveName);
   }
   finally {
     internals.debuglog('Creating index');
@@ -62,6 +61,6 @@ module.exports = async function(archiveDirectory) {
     await writeFile(indexFile, index);
 
     internals.debuglog('Copying posts to archive');
-    await internals.ncp(archiveDirectory, internals.kArchiveName);
+    await cp(archiveDirectory, internals.kArchiveName, { recursive: true });
   }
 };