From dc5250a74ebc2b1ea3beecabafa4520b6d141997 Mon Sep 17 00:00:00 2001 From: Aqr-K <95741669+Aqr-K@users.noreply.github.com> Date: Wed, 24 Jul 2024 23:10:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=87=8D=E5=90=AF=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8=E4=BB=A3=E7=90=86=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E4=BC=98=E5=85=88=E7=BA=A7=EF=BC=8C=E4=BC=98=E5=85=88?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=95=9C=E5=83=8F=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/update b/update index b02427ac..583a285b 100644 --- a/update +++ b/update @@ -117,12 +117,7 @@ function install_backend_and_download_resources() { } if [[ "${MOVIEPILOT_AUTO_UPDATE}" = "true" ]] || [[ "${MOVIEPILOT_AUTO_UPDATE}" = "release" ]] || [[ "${MOVIEPILOT_AUTO_UPDATE}" = "dev" ]]; then - if [ -n "${PROXY_HOST}" ]; then - CURL_OPTIONS="-sL -x ${PROXY_HOST}" - PIP_OPTIONS="--proxy=${PROXY_HOST}" - GITHUB_PROXY="" - INFO "使用全局代理更新程序与环境依赖" - elif [[ -n "${PIP_PROXY}" ]] || [[ -n "${GITHUB_PROXY}" ]]; then + if [[ -n "${PIP_PROXY}" ]] || [[ -n "${GITHUB_PROXY}" ]]; then CURL_OPTIONS="-sL" PIP_OPTIONS=${PIP_OPTIONS:+"-i ${PIP_PROXY}"} || PIP_OPTIONS="" GITHUB_PROXY=${GITHUB_PROXY:+"-i ${GITHUB_PROXY}"} || GITHUB_PROXY="" @@ -134,6 +129,11 @@ if [[ "${MOVIEPILOT_AUTO_UPDATE}" = "true" ]] || [[ "${MOVIEPILOT_AUTO_UPDATE}" else INFO "使用Pip镜像代理更新环境依赖,使用Github镜像代理更新程序" fi + elif [ -n "${PROXY_HOST}" ]; then + CURL_OPTIONS="-sL -x ${PROXY_HOST}" + PIP_OPTIONS="--proxy=${PROXY_HOST}" + GITHUB_PROXY="" + INFO "使用全局代理更新程序与环境依赖" else CURL_OPTIONS="-sL" INFO "不使用任何代理更新程序与环境依赖"