Merge e7070cb78e into edea8a9c3c

On busybox-based systems like Alpine Linux, wget does not have
certain CLI flags such as '--no-config'. Thus, search for the
existence of 'curl' first in the PATH before wget. wget2 is
still the preferred download tool.

README.md

@@ -783,7 +783,7 @@ This model can be also be converted manually to ggml using the following command
 $ python3 -m venv venv && source venv/bin/activate
 $ (venv) pip install silero-vad
 $ (venv) $ python models/convert-silero-vad-to-ggml.py --output models/silero.bin
-Saving GGML Silero-VAD model to models/silero-v5.1.2-ggml.bin
+Saving GGML Silero-VAD model to models/ggml-silero-v5.1.2.bin
 ```
 And it can then be used with whisper as follows:
 ```console
@@ -791,7 +791,7 @@ $ ./build/bin/whisper-cli \
    --file ./samples/jfk.wav \
    --model ./models/ggml-base.en.bin \
    --vad \
-   --vad-model ./models/silero-v5.1.2-ggml.bin
+   --vad-model ./models/ggml-silero-v5.1.2.bin
 ```
 
 ### VAD Options

models/convert-silero-vad-to-ggml.py

@@ -20,7 +20,7 @@ def convert_silero_vad(output_path, print_tensors=True):
             cleaned_dict[clean_key] = value
 
     base, ext = os.path.splitext(output_path)
-    output_file = f"{base}-v{silero_version}-ggml{ext}"
+    output_file = f"ggml-{base}-v{silero_version}{ext}"
     print(f"Saving GGML Silero-VAD model to {output_file}")
 
     print("\nTensor info for debugging:")

models/download-ggml-model.sh

@@ -119,12 +119,12 @@ fi
 
 if [ -x "$(command -v wget2)" ]; then
     wget2 --no-config --progress bar -O ggml-"$model".bin $src/$pfx-"$model".bin
-elif [ -x "$(command -v wget)" ]; then
-    wget --no-config --quiet --show-progress -O ggml-"$model".bin $src/$pfx-"$model".bin
 elif [ -x "$(command -v curl)" ]; then
     curl -L --output ggml-"$model".bin $src/$pfx-"$model".bin
+elif [ -x "$(command -v wget)" ]; then
+    wget --no-config --quiet --show-progress -O ggml-"$model".bin $src/$pfx-"$model".bin
 else
-    printf "Either wget or curl is required to download models.\n"
+    printf "Either wget2, curl, or wget is required to download models.\n"
     exit 1
 fi