1 files changed, 33 insertions, 11 deletions

diff --git a/scripts/run-tool.sh b/scripts/run-tool.sh
index 4c89d53..d70b292 100755
--- a/scripts/run-tool.sh
+++ b/scripts/run-tool.sh
@@ -2,16 +2,16 @@
 set -e
 
 main() {
-    this_file_name=run-tool.sh
-    parse_argv "$@"
     root_dir="$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/.." &> /dev/null && pwd)"
+    self_name=run-tool.sh
+    parse_argv "$@"
     setup_env
     tool_path="$root_dir/tools/$tool_name.sh"
-    run
+    run 
 }
 
 parse_argv() {
-    if [[ "$0" == *"$this_file_name" ]]; then
+    if [[ "$0" == *"$self_name" ]]; then
         tool_name="$1"
         tool_data="$2"
     else
@@ -24,28 +24,42 @@ parse_argv() {
 }
 
 setup_env() {
+    load_env "$root_dir/.env" 
     export LLM_ROOT_DIR="$root_dir"
-    if [[ -f "$LLM_ROOT_DIR/.env" ]]; then
-        set -o allexport && source "$LLM_ROOT_DIR/.env" && set +o allexport
-    fi
     export LLM_TOOL_NAME="$tool_name"
     export LLM_TOOL_CACHE_DIR="$LLM_ROOT_DIR/cache/$tool_name"
 }
 
+load_env() {
+    local env_file="$1" env_vars
+    if [[ -f "$env_file" ]]; then
+        while IFS='=' read -r key value; do
+            if [[ "$key" == $'#'* ]] || [[ -z "$key" ]]; then
+                continue
+            fi
+            if [[ -z "${!key+x}" ]]; then
+                env_vars="$env_vars $key=$value"
+            fi
+        done < "$env_file"
+        if [[ -n "$env_vars" ]]; then
+            eval "export $env_vars"
+        fi
+    fi
+}
+
 run() {
     if [[ -z "$tool_data" ]]; then
         die "No JSON data"
     fi
 
-    _jq=jq
     if [[ "$OS" == "Windows_NT" ]]; then
-        _jq="jq -b"
+        set -o igncr
         tool_path="$(cygpath -w "$tool_path")"
     fi
 
     data="$(
         echo "$tool_data" | \
-        $_jq -r '
+        jq -r '
         to_entries | .[] | 
         (.key | split("_") | join("-")) as $key |
         if .value | type == "array" then
@@ -62,10 +76,18 @@ run() {
         if [[ "$line" == '--'* ]]; then
             args+=("$line")
         else
-            args+=("$(echo "$line" | $_jq -r '.')")
+            args+=("$(echo "$line" | jq -r '.')")
         fi
     done <<< "$data"
+    no_llm_output=0
+    if [[ -z "$LLM_OUTPUT" ]]; then
+        no_llm_output=1
+        export LLM_OUTPUT="$(mktemp)"
+    fi
     "$tool_path" "${args[@]}"
+    if [[ "$no_llm_output" -eq 1 ]]; then
+        cat "$LLM_OUTPUT"
+    fi
 }
 
 die() {