From bfb7d75fe47ea588495c5be8157a67b1fec67a13 Mon Sep 17 00:00:00 2001
From: sigoden <sigoden@gmail.com>
Date: Thu, 6 Jun 2024 08:29:00 +0800
Subject: refactor: move tools/$lang/** to tools/** (#17)

---
 run/tool.js | 2 +-
 run/tool.py | 2 +-
 run/tool.rb | 2 +-
 run/tool.sh | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'run')

diff --git a/run/tool.js b/run/tool.js
index de97423..ad7c151 100755
--- a/run/tool.js
+++ b/run/tool.js
@@ -22,7 +22,7 @@ function parseArgv() {
 }
 
 function loadFunc(func_file) {
-  const func_path = path.resolve(__dirname, `../tools/js/${func_file}`)
+  const func_path = path.resolve(__dirname, `../tools/${func_file}`)
   try {
     return require(func_path);
   } catch {
diff --git a/run/tool.py b/run/tool.py
index 0555363..99163d3 100755
--- a/run/tool.py
+++ b/run/tool.py
@@ -23,7 +23,7 @@ def parse_argv():
 
 def load_func(func_file):
     base_dir = os.path.dirname(os.path.abspath(__file__))
-    func_path = os.path.join(base_dir, f"../tools/py/{func_file}")
+    func_path = os.path.join(base_dir, f"../tools/{func_file}")
     if os.path.exists(func_path):
         spec = importlib.util.spec_from_file_location(func_file, func_path)
         module = importlib.util.module_from_spec(spec)
diff --git a/run/tool.rb b/run/tool.rb
index 4a692ef..cf51f3f 100755
--- a/run/tool.rb
+++ b/run/tool.rb
@@ -21,7 +21,7 @@ def parse_argv
 end
 
 def load_func(func_file)
-  func_path = File.expand_path("../tools/rb/#{func_file}", __dir__)
+  func_path = File.expand_path("../tools/#{func_file}", __dir__)
 
   begin
     require func_path
diff --git a/run/tool.sh b/run/tool.sh
index da9e412..4846c8e 100755
--- a/run/tool.sh
+++ b/run/tool.sh
@@ -13,7 +13,7 @@ if [[ "$FUNC_FILE" != *'.sh' ]]; then
 fi
 
 PROJECT_DIR="$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/.." &> /dev/null && pwd)"
-FUNC_FILE="$PROJECT_DIR/tools/sh/$FUNC_FILE"
+FUNC_FILE="$PROJECT_DIR/tools/$FUNC_FILE"
 
 if [[ "$OS" == "Windows_NT" ]]; then
     FUNC_FILE="$(cygpath -w "$FUNC_FILE")"
-- 
cgit v1.2.3