fix(@feflow/cli): 修复终端配置文件中 feflow bin 路径被注释时的误判 (#436)

被注释的 export feflow bin path 命令应判断为无效，并重新添加
Tencent · Jun 30, 2023 · f1c62fa · f1c62fa
1 parent 90577be
commit f1c62fa
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/packages/feflow-cli/src/core/universal-pkg/binp/index.ts b/packages/feflow-cli/src/core/universal-pkg/binp/index.ts
@@ -3,6 +3,7 @@ import fs from 'fs';
 import path from 'path';
 import spawn from 'cross-spawn';
 import osenv from 'osenv';
+import escapeRegExp from 'lodash/escapeRegExp';
 
 /**
  * register the directory to the environment variable path
@@ -101,8 +102,10 @@ export default class Binp {
     if (!fs.existsSync(profile)) {
       return profile;
     }
-    const content = fs.readFileSync(profile)?.toString();
-    if (content?.indexOf(setStatement) === -1) {
+    const content = fs.readFileSync(profile)?.toString() || '';
+    // 排除包含字符串但被注释的情况
+    const setStatementRegExp = new RegExp(`(?<!#.*)${escapeRegExp(setStatement)}`);
+    if (!setStatementRegExp.test(content)) {
       return profile;
     }
     this.handleUnsupportedTerminal(profile);