creator/cc-1c-skills
1
0
Fork 0
mirror of https://github.com/Nikolay-Shirokov/cc-1c-skills.git synced 2026-09-16 23:05:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(web-publish): use WebClient for download, comment default Listen 80

Browse Source 
- PS 5.1 Invoke-WebRequest fails on 308 redirects; WebClient handles them
- Updated Apache URL to 2.4.66 VS18 (current release)
- Comment out default Listen 80 when adding marker block to avoid port conflict

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Nick Shirokov
2026-02-22 16:34:43 +03:00
co-authored by Claude Opus 4.6
parent a3e9e3c907
commit e2f765fcc0
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.claude/skills/web-publish/scripts/web-publish.ps1
+8 -4
View File
@@ -126,23 +126,25 @@ if (-not (Test-Path $httpdExe)) {
Write-Host "Apache не найден: $ApachePath" -ForegroundColor Yellow Write-Host "Apache не найден: $ApachePath" -ForegroundColor Yellow
Write-Host "" Write-Host ""
Write-Host "Установите Apache вручную:" -ForegroundColor Cyan Write-Host "Установите Apache вручную:" -ForegroundColor Cyan
Write-Host " 1. Скачайте Apache Lounge (x64 VS17) с https://www.apachelounge.com/download/" Write-Host " 1. Скачайте Apache Lounge (x64) с https://www.apachelounge.com/download/"
Write-Host " 2. Распакуйте содержимое Apache24\ в: $ApachePath" Write-Host " 2. Распакуйте содержимое Apache24\ в: $ApachePath"
Write-Host " 3. Запустите скрипт повторно" Write-Host " 3. Запустите скрипт повторно"
exit 1 exit 1
} }
Write-Host "Apache не найден. Скачиваю..." -ForegroundColor Cyan Write-Host "Apache не найден. Скачиваю..." -ForegroundColor Cyan
$zipUrl = "https://www.apachelounge.com/download/VS17/binaries/httpd-2.4.62-240904-win64-VS17.zip" $zipUrl = "https://www.apachelounge.com/download/VS18/binaries/httpd-2.4.66-260131-Win64-VS18.zip"
$tmpZip = Join-Path $env:TEMP "apache24.zip" $tmpZip = Join-Path $env:TEMP "apache24.zip"
$tmpDir = Join-Path $env:TEMP "apache24_extract" $tmpDir = Join-Path $env:TEMP "apache24_extract"
try { try {
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
Invoke-WebRequest -Uri $zipUrl -OutFile $tmpZip -UseBasicParsing # WebClient works better than Invoke-WebRequest in PS 5.1 (handles redirects)
$wc = New-Object System.Net.WebClient
$wc.DownloadFile($zipUrl, $tmpZip)
} catch { } catch {
Write-Host "Error: не удалось скачать Apache: $_" -ForegroundColor Red Write-Host "Error: не удалось скачать Apache: $_" -ForegroundColor Red
Write-Host "Скачайте вручную: $zipUrl" -ForegroundColor Yellow Write-Host "Скачайте вручную: https://www.apachelounge.com/download/" -ForegroundColor Yellow
exit 1 exit 1
} }
@@ -263,6 +265,8 @@ if ($confContent -match [regex]::Escape($globalMarkerStart)) {
$pattern = [regex]::Escape($globalMarkerStart) + '[\s\S]*?' + [regex]::Escape($globalMarkerEnd) $pattern = [regex]::Escape($globalMarkerStart) + '[\s\S]*?' + [regex]::Escape($globalMarkerEnd)
$confContent = [regex]::Replace($confContent, $pattern, $globalBlock) $confContent = [regex]::Replace($confContent, $pattern, $globalBlock)
} else { } else {
# Comment out default Listen to avoid port conflict
$confContent = $confContent -replace '(?m)^(Listen\s+\d+)', '#$1 # commented by web-publish'
# Append global block # Append global block
$confContent = $confContent.TrimEnd() + "`n`n" + $globalBlock + "`n" $confContent = $confContent.TrimEnd() + "`n`n" + $globalBlock + "`n"
} }