feat: use native remove files/dir

TerosTechnology · Aug 21, 2023 · a6bf057 · a6bf057
1 parent 6cd92e1
commit a6bf057
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 27 deletions.
diff --git a/packages/colibri/src/linter/vivado.ts b/packages/colibri/src/linter/vivado.ts
@@ -17,9 +17,7 @@
 // You should have received a copy of the GNU General Public License
 // along with TerosHDL.  If not, see <https://www.gnu.org/licenses/>.
 
-import { get_os } from "../process/utils";
-import { Process } from "../process/process";
-import { OS, p_options } from "../process/common";
+import {rm_sync} from "../utils/file_utils";
 
 import { get_hdl_language } from "../utils/common_utils";
 import { HDL_LANG } from "../common/general";
@@ -55,30 +53,11 @@ export class Vivado extends Base_linter {
     }
 
     async delete_previus_lint(working_dir: string) {
-        const opt: p_options = {
-            cwd: working_dir,
-        };
-
-        const os = get_os();
-        const p = new Process();
-
-        const path_0 = path_lib.join(working_dir, "xvhdl.pb");
-        const path_1 = path_lib.join(working_dir, "xvhdl.log");
-
-        const path_2 = path_lib.join(working_dir, "xvlog.pb");
-        const path_3 = path_lib.join(working_dir, "xvlog.log");
-
-        const path_4 = path_lib.join(working_dir, "xsim.dir");
-
-        if (os === OS.WINDOWS) {
-            // eslint-disable-next-line max-len
-            const command = `del ${path_0} && del ${path_1} && del ${path_2} && del ${path_3} && del -Recurse ${path_4} && Remove-Item -Recurse -Path ${path_4} && rmdir /s /q ${path_4}`;
-            await p.exec_wait(command, opt);
-        }
-        else {
-            const command = `rm ${path_0}; rm ${path_1}; rm ${path_2}; rm ${path_3}; rm -R ${path_4}`;
-            await p.exec_wait(command, opt);
-        }
+        const file_list_to_delte = ["xvhdl.pb", "xvhdl.log", "xvlog.pb", "xvlog.log", "xsim.dir"];
+        file_list_to_delte.forEach(element => {
+            const full_path = path_lib.join(working_dir, element);
+            rm_sync(full_path, true);
+        });
     }
 
     async lint(file: string, options: common.l_options): Promise<common.l_error[]> {

diff --git a/packages/colibri/src/utils/file_utils.ts b/packages/colibri/src/utils/file_utils.ts
@@ -199,6 +199,19 @@ export function remove_file(file_path: string) {
     catch (err) { }
 }
 
+/**
+ * Remove file/directory
+ * @param path File/directory path
+ * @param recursive Recursive delete
+*/
+export function rm_sync(path: string, recursive: boolean) {
+    try {
+        fs.rmSync(path, {recursive: recursive});
+    }
+    // eslint-disable-next-line no-empty
+    catch (err) { }
+}
+
 
 /**
  * Get all files or files and directories in a directory