From 76a20109bf0371601c9f2349648ac68f8d16c4b6 Mon Sep 17 00:00:00 2001
From: XXXXRT666 <157766680+XXXXRT666@users.noreply.github.com>
Date: Tue, 29 Apr 2025 19:27:19 +0100
Subject: [PATCH] Fix Bugs

---
 .github/workflows/docker-publish.yaml |  4 ++--
 Dockerfile                            | 10 +---------
 install.sh                            |  6 +-----
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml
index ab335516..22985463 100644
--- a/.github/workflows/docker-publish.yaml
+++ b/.github/workflows/docker-publish.yaml
@@ -37,7 +37,7 @@ jobs:
             USE_FUNASR=true
             USE_FASTERWHISPER=false
             CUDA_VERSION=12.4
-            WGET_SHOW_PROGRESS=0
+            WGET_CMD="wget -nv --tries=25 --wait=5 --read-timeout=40 --retry-on-http-error=404"
           tags: |
             xxxxrt666/gpt-sovits:lite-cu124-${{ steps.meta.outputs.tag }}
             xxxxrt666/gpt-sovits:latest-lite
@@ -54,7 +54,7 @@ jobs:
             USE_FUNASR=true
             USE_FASTERWHISPER=true
             CUDA_VERSION=12.4
-            WGET_SHOW_PROGRESS=0
+            WGET_CMD="wget -nv --tries=25 --wait=5 --read-timeout=40 --retry-on-http-error=404"
           tags: |
             xxxxrt666/gpt-sovits:cu124-${{ steps.meta.outputs.tag }}
             xxxxrt666/gpt-sovits:latest
diff --git a/Dockerfile b/Dockerfile
index 0461ef1e..cd8962ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,15 +28,7 @@ WORKDIR /workspace/GPT-SoVITS
 
 COPY . /workspace/GPT-SoVITS
 
-ARG WGET_SHOW_PROGRESS=1
-
-RUN if [ "$WGET_SHOW_PROGRESS" = "0" ]; then \
-      echo 'WGET_CMD=wget -nv --tries=25 --wait=5 --read-timeout=40 --retry-on-http-error=404' >> /env.list; \
-    else \
-      echo 'WGET_CMD=wget --tries=25 --wait=5 --read-timeout=40 --retry-on-http-error=404' >> /env.list; \
-    fi
-
-ENV $(cat /env.list)
+ARG WGET_CMD="wget --tries=25 --wait=5 --read-timeout=40 --retry-on-http-error=404"
 
 RUN eval "$WGET_CMD -O anaconda.sh https://repo.anaconda.com/archive/Anaconda3-2024.10-1-Linux-x86_64.sh" && \
     bash anaconda.sh -b -p /root/anaconda3 && \
diff --git a/install.sh b/install.sh
index 4e931767..5454cb4e 100644
--- a/install.sh
+++ b/install.sh
@@ -100,11 +100,7 @@ elif [ "$is_MODELSCOPE" = "true" ]; then
     UVR5_URL="https://www.modelscope.cn/models/XXXXRT/GPT-SoVITS-Pretrained/resolve/master/uvr5_weights.zip"
 fi
 
-if [ "$WGET_SHOW_PROGRESS" = "0" ]; then
-    WGET_CMD="wget -nv --tries=25 --wait=5 --read-timeout=40 --retry-on-http-error=404"
-else
-    WGET_CMD="wget --tries=25 --wait=5 --read-timeout=40 --retry-on-http-error=404"
-fi
+WGET_CMD="${WGET_CMD:-wget --tries=25 --wait=5 --read-timeout=40 --retry-on-http-error=404}"
 
 if find "GPT_SoVITS/pretrained_models" -mindepth 1 ! -name '.gitignore' | grep -q .; then
     echo "Pretrained Model Exists"