From: Henri Vasserman <redacted>
Date: Wed, 30 Aug 2023 16:14:53 +0000 (+0300)
Subject: [Docker] fix tools.sh argument passing. (#2884)
X-Git-Tag: gguf-v0.4.0~177
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=71d6975559acfd6c8407a4ef8275a9979c737765;p=pkg%2Fggml%2Fsources%2Fllama.cpp

[Docker] fix tools.sh argument passing. (#2884)

* [Docker] fix tools.sh argument passing.

This should allow passing multiple arguments to containers with
the full image that are using the tools.sh frontend.

Fix from https://github.com/ggerganov/llama.cpp/issues/2535#issuecomment-1697091734
---

diff --git a/.devops/tools.sh b/.devops/tools.sh
index 2787c21f..9d999315 100755
--- a/.devops/tools.sh
+++ b/.devops/tools.sh
@@ -7,15 +7,12 @@ arg1="$1"
 # Shift the arguments to remove the first one
 shift
 
-# Join the remaining arguments into a single string
-arg2="$@"
-
 if [[ "$arg1" == '--convert' || "$arg1" == '-c' ]]; then
-    python3 ./convert.py "$arg2"
+    python3 ./convert.py "$@"
 elif [[ "$arg1" == '--quantize' || "$arg1" == '-q' ]]; then
-    ./quantize "$arg2"
+    ./quantize "$@"
 elif [[ "$arg1" == '--run' || "$arg1" == '-r' ]]; then
-    ./main "$arg2"
+    ./main "$@"
 elif [[ "$arg1" == '--all-in-one' || "$arg1" == '-a' ]]; then
     echo "Converting PTH to GGML..."
     for i in `ls $1/$2/ggml-model-f16.bin*`; do
@@ -27,7 +24,7 @@ elif [[ "$arg1" == '--all-in-one' || "$arg1" == '-a' ]]; then
         fi
     done
 elif [[ "$arg1" == '--server' || "$arg1" == '-s' ]]; then
-    ./server "$arg2"
+    ./server "$@"
 else
     echo "Unknown command: $arg1"
     echo "Available commands: "