refactor: move tools/$lang/** to tools/** (#17)

Argcfile.sh

@@ -46,7 +46,7 @@ build-bin() {
     for name in "${names[@]}"; do
         basename="${name%.*}"
         lang="${name##*.}"
-        func_file="tools/$lang/$name"
+        func_file="tools/$name"
         if [[  -f "$func_file" ]]; then
             if _is_win; then
                 bin_file="$BIN_DIR/$basename.cmd" 
@@ -85,7 +85,7 @@ build-declarations-json() {
     build_failed_funcs=()
     for name in "${names[@]}"; do
         lang="${name##*.}"
-        func_file="tools/$lang/$name"
+        func_file="tools/$name"
         if [[ ! -f "$func_file" ]]; then
             not_found_funcs+=("$name")
             continue;
@@ -242,7 +242,7 @@ _choice_func() {
         lang="${item%:*}"
         cmd="${item#*:}"
         if command -v "$cmd" &> /dev/null; then
-            ls -1 tools/$lang  | grep "\.$lang$"
+            ls -1 tools | grep "\.$lang$"
         fi
     done
 }

README.md

@@ -76,7 +76,7 @@ The project supports write functions in bash/js/python.
 
 ### Bash
 
-Create a new bashscript in the [./tools/sh](./tools/sh/) directory (.e.g. `may_execute_command.sh`).
+Create a new bashscript in the [./tools/](./tools/) directory (.e.g. `may_execute_command.sh`).
 
 ```sh
 #!/usr/bin/env bash
@@ -109,7 +109,7 @@ The relationship between comment tags and parameters in function declarations is
 
 ### Javascript
 
-Create a new javascript in the [./tools/js](./tools/js/) directory (.e.g. `may_execute_command.js`).
+Create a new javascript in the [./tools/](./tools/) directory (.e.g. `may_execute_command.js`).
 
 ```js
 exports.declarate = function declarate() {
@@ -139,7 +139,7 @@ exports.execute = function execute(data) {
 
 ### Python
 
-Create a new python script in the [./tools/py](./tools/py/) directory (e.g., `may_execute_py_code.py`).
+Create a new python script in the [./tools/](./tools/) directory (e.g., `may_execute_py_code.py`).
 
 ```py
 def declarate():
@@ -167,7 +167,7 @@ def execute(data):
 
 ### Ruby
 
-Create a new ruby script in the [./tools/rb](./tools/rb/) directory (e.g., `may_execute_rb_code.rb`).
+Create a new ruby script in the [./tools/](./tools/) directory (e.g., `may_execute_rb_code.rb`).
 
 ```rb
 def declarate

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 {

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)

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

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")"