ee-bin 4.1.2 → 4.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-bin",
-  "version": "4.1.2",
+  "version": "4.1.4",
   "description": "ee bin",
   "main": "index.js",
   "scripts": {

package/tools/incrUpdater.js

@@ -3,10 +3,12 @@
 const path = require('path');
 const fs = require('fs');
 const fsPro = require('fs-extra');
-const crypto = require('crypto')
+const crypto = require('crypto');
 const chalk = require('chalk');
 const { loadConfig, getPackage, writeJsonSync } = require('../lib/utils');
-const admZip = require('adm-zip')
+const admZip = require('adm-zip');
+const globby = require('globby');
+
 
 /**
  * 增量升级
@@ -83,18 +85,23 @@ class IncrUpdater {
     zipName = path.basename(cfg.output.zip, '.zip') + `-${platformForFilename}-${version}.zip`;
     const asarZipPath = path.join(homeDir, cfg.output.directory, zipName);
     if (fs.existsSync(asarZipPath)) {
-      rm(asarZipPath);
+      fsPro.removeSync(asarZipPath);
     }
     const zip = new admZip();
     // 添加 asar 文件
     zip.addLocalFile(asarFilePath); 
     // 添加 extraResources
     if (cfg.extraResources && cfg.extraResources.length > 0) {
-      for (const extraRes of cfg.extraResources) {
+      const files = globby.sync(cfg.extraResources, { cwd: homeDir });
+      for (const extraRes of files) {
         const extraResPath = path.normalize(path.join(homeDir, extraRes));
-        if (fs.existsSync(extraResPath)) {
-          zip.addLocalFile(extraResPath, "extraResources");
+        if (!fs.existsSync(extraResPath)) {
+          continue;
         }
+        const extraResDir = path.dirname(extraResPath);
+        const index = extraResDir.indexOf('extraResources');
+        const zipFileDir = extraResDir.substring(index);
+        zip.addLocalFile(extraResPath, zipFileDir);
       }
     }