diff --git a/Argcfile.sh b/Argcfile.sh index 1031df8..09686b6 100644 --- a/Argcfile.sh +++ b/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 } diff --git a/README.md b/README.md index 83c9df8..9bcb735 100644 --- a/README.md +++ b/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 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")" diff --git a/tools/sh/get_current_time.sh b/tools/get_current_time.sh similarity index 100% rename from tools/sh/get_current_time.sh rename to tools/get_current_time.sh diff --git a/tools/sh/get_current_weather.sh b/tools/get_current_weather.sh similarity index 100% rename from tools/sh/get_current_weather.sh rename to tools/get_current_weather.sh diff --git a/tools/sh/get_web_page.sh b/tools/get_web_page.sh similarity index 100% rename from tools/sh/get_web_page.sh rename to tools/get_web_page.sh diff --git a/tools/sh/may_execute_command.sh b/tools/may_execute_command.sh similarity index 100% rename from tools/sh/may_execute_command.sh rename to tools/may_execute_command.sh diff --git a/tools/js/may_execute_js_code.js b/tools/may_execute_js_code.js similarity index 100% rename from tools/js/may_execute_js_code.js rename to tools/may_execute_js_code.js diff --git a/tools/py/may_execute_py_code.py b/tools/may_execute_py_code.py similarity index 100% rename from tools/py/may_execute_py_code.py rename to tools/may_execute_py_code.py diff --git a/tools/rb/may_execute_rb_code.rb b/tools/may_execute_rb_code.rb similarity index 100% rename from tools/rb/may_execute_rb_code.rb rename to tools/may_execute_rb_code.rb diff --git a/tools/sh/search_duckduckgo.sh b/tools/search_duckduckgo.sh similarity index 100% rename from tools/sh/search_duckduckgo.sh rename to tools/search_duckduckgo.sh diff --git a/tools/sh/search_wolframalpha.sh b/tools/search_wolframalpha.sh similarity index 100% rename from tools/sh/search_wolframalpha.sh rename to tools/search_wolframalpha.sh