diff --git a/src/scripts/tools/add_tools.ps1 b/src/scripts/tools/add_tools.ps1 index b117d3497..a3eb4add2 100644 --- a/src/scripts/tools/add_tools.ps1 +++ b/src/scripts/tools/add_tools.ps1 @@ -23,6 +23,9 @@ Function Edit-ComposerConfig() { if (-not(Test-Path $composer_json)) { Set-Content -Path $composer_json -Value "{}" } + if ($env:COMPOSER_PROCESS_TIMEOUT) { + (Get-Content $src\configs\composer.env -Raw) -replace '(?m)^COMPOSER_PROCESS_TIMEOUT=.*$', "COMPOSER_PROCESS_TIMEOUT=$env:COMPOSER_PROCESS_TIMEOUT" | Set-Content $src\configs\composer.env + } Add-EnvPATH $src\configs\composer.env Add-Path $composer_bin Set-ComposerAuth diff --git a/src/scripts/tools/add_tools.sh b/src/scripts/tools/add_tools.sh index 0ffbba51d..549bcd0cf 100644 --- a/src/scripts/tools/add_tools.sh +++ b/src/scripts/tools/add_tools.sh @@ -42,7 +42,11 @@ configure_composer() { echo '{}' | tee "$composer_json" >/dev/null chmod 644 "$composer_json" fi - add_env_path "${src:?}"/configs/composer.env + [ -n "$COMPOSER_PROCESS_TIMEOUT" ] && ( + sed -i "s/COMPOSER_PROCESS_TIMEOUT.*/COMPOSER_PROCESS_TIMEOUT=$COMPOSER_PROCESS_TIMEOUT/" "${src:?}"/configs/composer.env || + sed -i '' "s/COMPOSER_PROCESS_TIMEOUT.*/COMPOSER_PROCESS_TIMEOUT=$COMPOSER_PROCESS_TIMEOUT/" "$src"/configs/composer.env + ) + add_env_path "$src"/configs/composer.env add_path "$composer_bin" set_composer_auth }