Skip to content

Commit

Permalink
! 7-zip in Windows installation was missing.
Browse files Browse the repository at this point in the history
# 2024.08.02
  • Loading branch information
drweb86 committed Aug 2, 2024
1 parent bb7c1fc commit d3ac931
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 10 deletions.
6 changes: 6 additions & 0 deletions help/Version History (Changelog).md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 2024.08.02

## Bug Fixes

- 7-zip in Windows installation was missing.

# 2024.07.29

## Changes
Expand Down
27 changes: 18 additions & 9 deletions sources/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,30 @@ if ($LastExitCode -ne 0)
}
Set-Location ../..

Write-Output "Downloading 7-zip..."
$WebClient = New-Object System.Net.WebClient
$sevenZipVersion="7z2407"
$sevenZipFolder=[System.IO.Path]::GetTempPath() + "$($sevenZipVersion)"

if (-Not (Test-Path "$($sevenZipFolder)"))
Write-Output "Clear 7-zip folder..."
if (Test-Path $sevenZipFolder)
{
mkdir "$($sevenZipFolder)"
$WebClient.DownloadFile("https://www.7-zip.org/a/$($sevenZipVersion)-x64.exe","$($sevenZipFolder)\x64.exe")
$WebClient.DownloadFile("https://www.7-zip.org/a/$($sevenZipVersion)-arm64.exe","$($sevenZipFolder)\arm64.exe")

& "c:\Program Files\7-Zip\7z.exe" x -y "$($sevenZipFolder)\x64.exe" -o"$($sevenZipFolder)\x64\7-zip"
& "c:\Program Files\7-Zip\7z.exe" x -y "$($sevenZipFolder)\arm64.exe" -o"$($sevenZipFolder)\arm64\7-zip"
Remove-Item $sevenZipFolder -Confirm:$false -Recurse:$true
if ($LastExitCode -ne 0)
{
Write-Error "Fail."
Exit 1
}
}

Write-Output "Downloading 7-zip..."
$WebClient = New-Object System.Net.WebClient

mkdir "$($sevenZipFolder)"
$WebClient.DownloadFile("https://www.7-zip.org/a/$($sevenZipVersion)-x64.exe","$($sevenZipFolder)\x64.exe")
$WebClient.DownloadFile("https://www.7-zip.org/a/$($sevenZipVersion)-arm64.exe","$($sevenZipFolder)\arm64.exe")

& "c:\Program Files\7-Zip\7z.exe" x -y "$($sevenZipFolder)\x64.exe" -o"$($sevenZipFolder)\x64\7-zip"
& "c:\Program Files\7-Zip\7z.exe" x -y "$($sevenZipFolder)\arm64.exe" -o"$($sevenZipFolder)\arm64\7-zip"

Write-Output "Clear bin/obj folders..."
Get-ChildItem .\ -include bin,obj -Recurse | ForEach-Object ($_) { Remove-Item $_.FullName -Force -Recurse }
if ($LastExitCode -ne 0)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Created using wingetcreate 1.6.1.0
# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.6.0.schema.json

PackageIdentifier: SiarheiKuchuk.BUtil
PackageVersion: 2024.07.29
InstallerType: inno
Installers:
- InstallerUrl: https://github.com/drweb86/butil/releases/download/2024.07.29/BUtil_v2024.07.29_win-arm64.exe
Architecture: arm64
InstallerSha256: B761E4B907F72123C7D6958D89C88CFCB697553707EE9523E32B52F541D1006B
- InstallerUrl: https://github.com/drweb86/butil/releases/download/2024.07.29/BUtil_v2024.07.29_win-x64.exe
Architecture: x64
InstallerSha256: 20B0E20DF4A4F17EFBEE202441AC1A65EE236B8A7B084F0614AC460C9F24D2D5
ManifestType: installer
ManifestVersion: 1.6.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Created using wingetcreate 1.6.1.0
# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultLocale.1.6.0.schema.json

PackageIdentifier: SiarheiKuchuk.BUtil
PackageVersion: 2024.07.29
PackageLocale: en-US
Publisher: Siarhei Kuchuk
PackageName: BUtil
License: MIT,GPL,MSPL
Copyright: 2011-2024 Siarhei Kuchuk
ShortDescription: BUtil creates incremental backups, incremental synchronization and imports multimedia on your PC with deduplication and FTPS, SMB/CIFS, MTP transports support for Windows and Linux.
ManifestType: defaultLocale
ManifestVersion: 1.6.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Created using wingetcreate 1.6.1.0
# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.6.0.schema.json

PackageIdentifier: SiarheiKuchuk.BUtil
PackageVersion: 2024.07.29
DefaultLocale: en-US
ManifestType: version
ManifestVersion: 1.6.0
2 changes: 1 addition & 1 deletion sources/ubuntu-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Fail on first error.
set -e

version=2024.07.29
version=2024.08.02

sourceCodeInstallationDirectory=/usr/local/src/butil
binariesInstallationDirectory=/usr/local/butil
Expand Down

0 comments on commit d3ac931

Please sign in to comment.