From 6fc3e3bbbb9bed5eefeb34c6cc7fdf5947c48cd4 Mon Sep 17 00:00:00 2001 From: Oleg Shparber Date: Sat, 28 Mar 2026 01:11:08 +0300 Subject: [PATCH] build(chocolatey): remove all bom related logic --- .editorconfig | 4 ---- pkg/chocolatey/update.ps1 | 9 ++++----- pkg/chocolatey/zeal.install/tools/chocolateyinstall.ps1 | 2 +- pkg/chocolatey/zeal.portable/tools/chocolateyinstall.ps1 | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.editorconfig b/.editorconfig index 013443db..f04f3a67 100644 --- a/.editorconfig +++ b/.editorconfig @@ -25,7 +25,3 @@ indent_size = 2 [*.nuspec] indent_size = 2 - -[*.ps1] -# https://docs.chocolatey.org/en-us/create/create-packages#character-encoding -charset = utf-8-bom diff --git a/pkg/chocolatey/update.ps1 b/pkg/chocolatey/update.ps1 index e870a59b..6bcf7279 100644 --- a/pkg/chocolatey/update.ps1 +++ b/pkg/chocolatey/update.ps1 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Oleg Shparber, et al. +# SPDX-FileCopyrightText: Oleg Shparber, et al. # SPDX-License-Identifier: MIT param( @@ -67,11 +67,10 @@ if ($Version) { foreach ($file in $files) { $path = Join-Path $root $file - $encoding = if ($path -like '*.ps1') { 'utf8BOM' } else { 'utf8NoBOM' } $content = Get-Content $path -Raw $content = $content -replace '\d+\.\d+\.\d+', $Version $content = $content -replace $copyrightPattern, $copyrightReplace - Set-Content $path $content -NoNewline -Encoding $encoding + Set-Content $path $content -NoNewline Write-Information "Updated $file" } @@ -79,14 +78,14 @@ if ($Version) { $content = Get-Content $path -Raw if ($content -notmatch '(?<=Checksum64\s+=\s+'')[a-f0-9]{64}') { throw "Checksum pattern not found in $path" } $content = $content -replace '(?<=Checksum64\s+=\s+'')[a-f0-9]{64}', $msiChecksum - Set-Content $path $content -NoNewline -Encoding utf8BOM + Set-Content $path $content -NoNewline Write-Information "Updated MSI checksum" $path = Join-Path $root 'zeal.portable\tools\chocolateyinstall.ps1' $content = Get-Content $path -Raw if ($content -notmatch '(?<=Checksum64\s+=\s+'')[a-f0-9]{64}') { throw "Checksum pattern not found in $path" } $content = $content -replace '(?<=Checksum64\s+=\s+'')[a-f0-9]{64}', $portableChecksum - Set-Content $path $content -NoNewline -Encoding utf8BOM + Set-Content $path $content -NoNewline Write-Information "Updated portable checksum" Write-Information "`nDone. Updated to v$Version." diff --git a/pkg/chocolatey/zeal.install/tools/chocolateyinstall.ps1 b/pkg/chocolatey/zeal.install/tools/chocolateyinstall.ps1 index 7fbb21c1..5ec0e739 100644 --- a/pkg/chocolatey/zeal.install/tools/chocolateyinstall.ps1 +++ b/pkg/chocolatey/zeal.install/tools/chocolateyinstall.ps1 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Oleg Shparber, et al. +# SPDX-FileCopyrightText: Oleg Shparber, et al. # SPDX-License-Identifier: MIT $ErrorActionPreference = 'Stop' diff --git a/pkg/chocolatey/zeal.portable/tools/chocolateyinstall.ps1 b/pkg/chocolatey/zeal.portable/tools/chocolateyinstall.ps1 index 81a25ba4..93a2f83c 100644 --- a/pkg/chocolatey/zeal.portable/tools/chocolateyinstall.ps1 +++ b/pkg/chocolatey/zeal.portable/tools/chocolateyinstall.ps1 @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Oleg Shparber, et al. +# SPDX-FileCopyrightText: Oleg Shparber, et al. # SPDX-License-Identifier: MIT $ErrorActionPreference = 'Stop'