fixes to fonts

inlife · Nov 27, 2024 · e75e008 · e75e008
1 parent e4b884e
commit e75e008
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/packages/nexrender-action-fonts/index.js b/packages/nexrender-action-fonts/index.js
@@ -5,18 +5,19 @@ const { name } = require("./package.json");
 
 const installMac = async (settings, job, fontpath) => {
     const fontdir = path.join(process.env.HOME, "Library", "Fonts");
+    const fontdest = path.join(fontdir, path.basename(fontpath));
 
     if (!fs.existsSync(fontdir)) {
         fs.mkdirSync(fontdir, { recursive: true });
     }
 
-    if (fs.existsSync(fontpath)) {
-        settings.logger.log(`[action-fonts] Font ${fontpath} already exists, skipping.`);
+    if (fs.existsSync(fontdest)) {
+        settings.logger.log(`[action-fonts] Font ${fontdest} already exists, skipping.`);
         return 0;
     }
 
-    settings.logger.log(`[action-fonts] Installing font ${fontpath} to ${fontdir}...`);
-    fs.copyFileSync(fontpath, path.join(fontdir, path.basename(fontpath)));
+    settings.logger.log(`[action-fonts] Installing font ${fontpath} to ${fontdest}...`);
+    fs.copyFileSync(fontpath, fontdest);
 
     return 1;
 };
@@ -34,7 +35,7 @@ const installWin = async (settings, job, fontpath) => {
         return 0;
     }
 
-    settings.logger.log(`[action-fonts] Installing font ${fontpath} to ${fontdir}...`);
+    settings.logger.log(`[action-fonts] Installing font ${fontpath} to ${fontdest}...`);
     fs.copyFileSync(fontpath, fontdest);
 
     const fontdisplayname = path.basename(fontpath, path.extname(fontpath)).replace(/-/g, " ");