crabatool 1.0.819 → 1.0.820

package/lib/utils.js

@@ -1237,7 +1237,7 @@ class Utils {
  * 在指定目录执行命令
  */
   async executeCommand(command, repoPath = config.webPath, timeout = 30000) {
-    this._log(`执行: ${command}`);
+    console.log(`执行: ${command}`);
 
     try {
       const { stdout, stderr } = await execPromise(command, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.819",
+  "version": "1.0.820",
   "description": "crabatool",
   "main": "index.js",
   "bin": {

package/tool/merge/mergeTool.js

@@ -93,13 +93,19 @@ function buildFolder(options) {
     if (config.exp) {
       var list = config.exp.split(';');
       list.forEach(function(item) {
+        if (!item) return;
         var arr = item.split('=');
-        var key = arr[0].trim();
+        var key = (arr[0] || '').trim();
+        if (!key) return;
+
         var value;
         if (key == '$versionDate$') {
           value = new Date().toString('yyyyMMddhh');
-        } else {
+        } else if (arr.length > 1 && arr[1] != null) {
           value = arr[1].trim();
+        } else {
+          utils.log('exp变量格式不正确，已忽略:' + item);
+          return;
         }
         content = content.replaceAll(key, value);
 
@@ -280,4 +286,4 @@ function copyByteToCache(filePath, content, stats, options) {
   utils.debug("拷贝到缓存:" + cachePath);
   fs.writeFileSync(cachePath, content, 'utf8');
   fs.utimesSync(cachePath, stats.atime, stats.mtime); // 必须同步文件时间
-}
+}

package/tool/upgrade.js

@@ -64,7 +64,7 @@ class Upgrade {
       console.log('没有git推送权限，取消craba的更新操作');
       return;
     }
-    
+
     console.log('当前git有推送权限,开始检查更新craba');
 
     this.checkUpdateCrabaNext();
@@ -89,8 +89,6 @@ class Upgrade {
 
     var gitCmd = `git push origin ${branchName}`;
     console.log('🚀 执行推送测试是否有权限...');
-    console.log(gitCmd);
-
     const pushResult = await utils.executeCommand(
       gitCmd,
       60000 // 推送可能需要更长时间