diff --git a/deploy/installer/configure_embed.ps1 b/deploy/installer/configure_embed.ps1 index 28e85d13b..5a28361c6 100644 --- a/deploy/installer/configure_embed.ps1 +++ b/deploy/installer/configure_embed.ps1 @@ -40,23 +40,32 @@ if ($PthFile) { } # --------------------------------------------------------------- -# 2. Installer pip (bootstrap via get-pip.py) +# 2-3. Dependances Python +# Si l'embed est livre complet (deps + tkinter pre-embarques), +# on saute le bootstrap pip / install : INSTALL HORS-LIGNE possible. +# Sinon (embed nu), on bootstrap pip + installe requirements (mode online). # --------------------------------------------------------------- -$GetPip = Join-Path $env:TEMP "get-pip.py" -Write-Host " Telechargement de get-pip.py..." -Invoke-WebRequest -Uri "https://bootstrap.pypa.io/get-pip.py" -OutFile $GetPip -UseBasicParsing +$DepsOk = $false +& $PythonExe -c "import socketio, tkinter" 2>$null +if ($LASTEXITCODE -eq 0) { $DepsOk = $true } -Write-Host " Installation de pip..." -& $PythonExe $GetPip --no-warn-script-location -Remove-Item $GetPip -Force +if ($DepsOk) { + Write-Host " Dependances deja embarquees (socketio + tkinter) - pip saute (offline OK)." +} else { + # Bootstrap pip (necessite internet) + $GetPip = Join-Path $env:TEMP "get-pip.py" + Write-Host " Telechargement de get-pip.py..." + Invoke-WebRequest -Uri "https://bootstrap.pypa.io/get-pip.py" -OutFile $GetPip -UseBasicParsing -# --------------------------------------------------------------- -# 3. Installer les dependances -# --------------------------------------------------------------- -$Requirements = Join-Path $AppDir "requirements_agent.txt" -if (Test-Path $Requirements) { - Write-Host " Installation des dependances Python..." - & $PythonExe -m pip install --no-warn-script-location -r $Requirements + Write-Host " Installation de pip..." + & $PythonExe $GetPip --no-warn-script-location + Remove-Item $GetPip -Force + + $Requirements = Join-Path $AppDir "requirements_agent.txt" + if (Test-Path $Requirements) { + Write-Host " Installation des dependances Python..." + & $PythonExe -m pip install --no-warn-script-location -r $Requirements + } } # ---------------------------------------------------------------