diff --git a/run.bat b/run.bat index cc528d2..14f08e8 100644 --- a/run.bat +++ b/run.bat @@ -1,4 +1,4 @@ -:: @echo off +@echo off SETLOCAL EnableExtensions SET "BASE_DIR=%~dp0" @@ -35,6 +35,7 @@ exit /b :PYTHON_FOUND +set "IS_VENV=false" :: --- VENV creation --- if not exist "%VENV_DIR%" ( echo [2/4] Virtual environment creation... @@ -45,6 +46,7 @@ if not exist "%VENV_DIR%" ( exit /b ) ) else ( + set "IS_VENV=true" echo [2/4] Virtual environment already here. ) @@ -52,11 +54,13 @@ if not exist "%VENV_DIR%" ( echo [3/4] Activation of the venv and installation of dependencies... call "%VENV_DIR%\Scripts\activate" -if exist "%BASE_DIR%%REQUIREMENTS%" ( - pip install --upgrade pip - pip install -r "%BASE_DIR%%REQUIREMENTS%" -) else ( - echo Info : No '%REQUIREMENTS%' file found, dependencies ignored. +if "%IS_VENV%"=="false" ( + if exist "%BASE_DIR%%REQUIREMENTS%" ( + pip install --upgrade pip + pip install -r "%BASE_DIR%%REQUIREMENTS%" + ) else ( + echo Info : No '%REQUIREMENTS%' file found, dependencies ignored. + ) ) :: --- Application launching --- diff --git a/run.ps1 b/run.ps1 index 7e24ca3..f304b3f 100644 --- a/run.ps1 +++ b/run.ps1 @@ -27,11 +27,14 @@ if (-not $PythonExe) { Write-Host "[+] Python found: $($PythonExe.Source)" -ForegroundColor Green +$is_venv = $false + # 3. Virtual Environment management if (-not (Test-Path $VenvPath)) { Write-Host "[2/4] Creating virtual environment..." -ForegroundColor Cyan & $PythonExe.Source -m venv $VenvPath } else { + $is_venv = $true Write-Host "[2/4] Virtual environment already exists." -ForegroundColor Green } @@ -52,7 +55,7 @@ if ($env:VIRTUAL_ENV -and (Test-Path $env:VIRTUAL_ENV)) { # 5. Execution try { - if (Test-Path $Requirements) { + if ((Test-Path $Requirements) -and -not $is_venv) { Write-Host "[+] Installing requirements..." -ForegroundColor Yellow python -m pip install --upgrade pip --quiet pip install -r $Requirements @@ -62,7 +65,7 @@ try { } Write-Host "[4/4] Starting $AppName..." -ForegroundColor Cyan Write-Host "-----------------------------------------------------------" -ForegroundColor Gray - python $PythonScript + python $PythonScript $args } catch { Write-Host "An error occurred during execution." -ForegroundColor Red