fix: 忽略外部虚拟环境变量

main
NoahLan 2 weeks ago
parent 079e1ffb98
commit 3eb3cae909

@ -5,6 +5,13 @@ set "SCRIPT_DIR=%~dp0"
set "ROOT_DIR=%SCRIPT_DIR%" set "ROOT_DIR=%SCRIPT_DIR%"
pushd "%ROOT_DIR%" >nul pushd "%ROOT_DIR%" >nul
set "PROJECT_VENV=%ROOT_DIR%.venv"
if defined VIRTUAL_ENV (
if /I not "%VIRTUAL_ENV%"=="%PROJECT_VENV%" (
if /I not "%VIRTUAL_ENV%"=="%PROJECT_VENV%\" set "VIRTUAL_ENV="
)
)
set "COMMAND=%~1" set "COMMAND=%~1"
if "%COMMAND%"=="" set "COMMAND=help" if "%COMMAND%"=="" set "COMMAND=help"
shift /1 shift /1

@ -4,6 +4,15 @@ set -eu
ROOT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) ROOT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
cd "$ROOT_DIR" cd "$ROOT_DIR"
PROJECT_VENV="$ROOT_DIR/.venv"
case "${VIRTUAL_ENV:-}" in
""|"$PROJECT_VENV"|"$PROJECT_VENV/")
;;
*)
unset VIRTUAL_ENV
;;
esac
show_help() { show_help() {
cat <<'EOF' cat <<'EOF'
{{ project_name }} 项目脚本 {{ project_name }} 项目脚本

@ -4,6 +4,14 @@ setlocal enabledelayedexpansion
set "SCRIPT_DIR=%~dp0" set "SCRIPT_DIR=%~dp0"
set "ROOT_DIR=%SCRIPT_DIR%.." set "ROOT_DIR=%SCRIPT_DIR%.."
pushd "%ROOT_DIR%" >nul pushd "%ROOT_DIR%" >nul
set "ROOT_DIR=%CD%"
set "PROJECT_VENV=%ROOT_DIR%\.venv"
if defined VIRTUAL_ENV (
if /I not "%VIRTUAL_ENV%"=="%PROJECT_VENV%" (
if /I not "%VIRTUAL_ENV%"=="%PROJECT_VENV%\" set "VIRTUAL_ENV="
)
)
set "COMMAND=%~1" set "COMMAND=%~1"
if "%COMMAND%"=="" set "COMMAND=help" if "%COMMAND%"=="" set "COMMAND=help"

@ -4,6 +4,15 @@ set -eu
ROOT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd) ROOT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")/.." && pwd)
cd "$ROOT_DIR" cd "$ROOT_DIR"
PROJECT_VENV="$ROOT_DIR/.venv"
case "${VIRTUAL_ENV:-}" in
""|"$PROJECT_VENV"|"$PROJECT_VENV/")
;;
*)
unset VIRTUAL_ENV
;;
esac
show_help() { show_help() {
cat <<'EOF' cat <<'EOF'
iTi-Flask 开发脚本 iTi-Flask 开发脚本

Loading…
Cancel
Save