diff --git a/src/scripts/win32.ps1 b/src/scripts/win32.ps1 index ffcc91cc..0db6999d 100644 --- a/src/scripts/win32.ps1 +++ b/src/scripts/win32.ps1 @@ -200,6 +200,16 @@ Function Set-PhpCache { } catch { } } +# Function to install nightly version of PHP +Function Install-PhpNightly { + Invoke-WebRequest -UseBasicParsing -Uri $php_builder/releases/latest/download/Get-PhpNightly.ps1 -OutFile $php_dir\Get-PhpNightly.ps1 > $null 2>&1 + & $php_dir\Get-PhpNightly.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir -Version $version > $null 2>&1 + if(Test-Path $php_dir\COMMIT) { + return " ($( Get-Content $php_dir\COMMIT ))" + } + return; +} + # Variables $tick = ([char]8730) $cross = ([char]10007) @@ -280,11 +290,7 @@ if ($null -eq $installed -or -not("$($installed.Version).".StartsWith(($version } try { if ($version -match $nightly_versions) { - Invoke-WebRequest -UseBasicParsing -Uri $php_builder/releases/latest/download/Get-PhpNightly.ps1 -OutFile $php_dir\Get-PhpNightly.ps1 > $null 2>&1 - & $php_dir\Get-PhpNightly.ps1 -Architecture $arch -ThreadSafe $ts -Path $php_dir -Version $version > $null 2>&1 - if(Test-Path $php_dir\COMMIT) { - $extra_version = " ($( Get-Content $php_dir\COMMIT ))" - } + $extra_version = Install-PhpNightly } else { Set-PhpCache Install-Php -Version $version -Architecture $arch -ThreadSafe $ts -InstallVC -Path $php_dir -TimeZone UTC -InitialPhpIni production -Force > $null 2>&1