From 21a6494cc49df4e076a12134f0ff5afd5a76717d Mon Sep 17 00:00:00 2001 From: Dmitrii Date: Sun, 22 Mar 2026 20:11:32 +0300 Subject: [PATCH] =?UTF-8?q?fix(chezmoi):=20=D0=BA=D0=B8=D1=80=D0=B8=D0=BB?= =?UTF-8?q?=D0=BB=D0=B8=D1=86=D0=B0=20=D0=B2=20PS-=D1=81=D0=BA=D1=80=D0=B8?= =?UTF-8?q?=D0=BF=D1=82=D0=B0=D1=85=20=D0=BB=D0=BE=D0=BC=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=20=D0=BF=D0=B0=D1=80=D1=81=D0=B5=D1=80=20=D0=BD=D0=B0=20Window?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Зачем: - PS 5.1 читает UTF-8 без BOM как системную кодовую страницу; байт 0x91 из «Бэкап» интерпретировался как кавычка, ломая парсер. - Что: - заменена кириллица в Write-Host/Write-Warning на английский текст в run_20-configure-windows-terminal.ps1 и run_before_10-migrate-gitconfig.ps1. - комментарии на русском оставлены (парсер их не обрабатывает). - Проверка: - chezmoi -S "$HOME\dotfiles\chezmoi" apply (на Windows) Co-Authored-By: Claude Opus 4.6 (1M context) --- .../.chezmoiscripts/run_20-configure-windows-terminal.ps1 | 6 +++--- .../.chezmoiscripts/run_before_10-migrate-gitconfig.ps1 | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/chezmoi/.chezmoiscripts/run_20-configure-windows-terminal.ps1 b/chezmoi/.chezmoiscripts/run_20-configure-windows-terminal.ps1 index 51ac11a..5ea0cd7 100644 --- a/chezmoi/.chezmoiscripts/run_20-configure-windows-terminal.ps1 +++ b/chezmoi/.chezmoiscripts/run_20-configure-windows-terminal.ps1 @@ -228,12 +228,12 @@ $Settings.profiles.list = $OrderedArray # ── Запись, только если что-то реально изменилось ───────────────────── if (-not $Changed) { - Write-Host 'Windows Terminal: настройки уже соответствуют baseline.' + Write-Host 'Windows Terminal: settings already match baseline.' return } $BackupPath = '{0}.bak-{1}' -f $SettingsPath, (Get-Date -Format 'yyyyMMdd-HHmmss') Copy-Item -LiteralPath $SettingsPath -Destination $BackupPath -Force $Settings | ConvertTo-Json -Depth 100 | Set-Content -LiteralPath $SettingsPath -Encoding utf8BOM -Write-Host "Windows Terminal: обновлено $SettingsPath" -Write-Host "Бэкап: $BackupPath" +Write-Host "Windows Terminal: updated $SettingsPath" +Write-Host "Backup: $BackupPath" diff --git a/chezmoi/.chezmoiscripts/run_before_10-migrate-gitconfig.ps1 b/chezmoi/.chezmoiscripts/run_before_10-migrate-gitconfig.ps1 index 2d5754d..87aca80 100644 --- a/chezmoi/.chezmoiscripts/run_before_10-migrate-gitconfig.ps1 +++ b/chezmoi/.chezmoiscripts/run_before_10-migrate-gitconfig.ps1 @@ -93,12 +93,12 @@ if (-not (Test-Path -LiteralPath $LocalConfig)) { foreach ($Key in $ManagedKeys) { git config --file $LocalConfig --unset-all $Key 2>$null } - Write-Host "Мигрировано: ~/.gitconfig -> ~/.gitconfig.local" - Write-Host "Бэкап: $BackupPath" + Write-Host "Migrated: ~/.gitconfig -> ~/.gitconfig.local" + Write-Host "Backup: $BackupPath" return } # Случай 4: .gitconfig.local уже есть — просто бэкапим. Copy-Item -LiteralPath $GlobalConfig -Destination $BackupPath -Force -Write-Warning "~/.gitconfig.local уже существует; текущий ~/.gitconfig сохранён в бэкап." -Write-Host "Бэкап: $BackupPath" +Write-Warning "~/.gitconfig.local already exists; current ~/.gitconfig saved as backup." +Write-Host "Backup: $BackupPath"