Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
update 7-zip 24.05 (#52)
Browse files Browse the repository at this point in the history
hemnstill authored May 15, 2024
1 parent 5bb687b commit 2a272fc
Showing 10 changed files with 6 additions and 14 deletions.
12 changes: 2 additions & 10 deletions .tests/test_tools_linux.sh
Original file line number Diff line number Diff line change
@@ -15,16 +15,8 @@ testGrepVersion() {
}

test7zVersion() {
actual_version="$("$p7z" | head -3)"
if [[ "$is_alpine_os" == true ]]; then
assertEquals "
7-Zip (z) 21.07 (x64) : Copyright (c) 1999-2021 Igor Pavlov : 2021-12-26
64-bit locale=C UTF8=- Threads:4, ASM" "$actual_version" # editorconfig-checker-disable-line
else
assertEquals "
7-Zip (z) 21.07 (x64) : Copyright (c) 1999-2021 Igor Pavlov : 2021-12-26
64-bit locale=C.UTF-8 Threads:4, ASM" "$actual_version" # editorconfig-checker-disable-line
fi
assertEquals "
7-Zip (z) 24.05 (x64) : Copyright (c) 1999-2024 Igor Pavlov : 2024-05-14" "$("$p7z" | head -2)"
}

testBusyboxVersion() {
2 changes: 1 addition & 1 deletion .tests/test_tools_windows.sh
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ testGrepVersion() {

test7zVersion() {
assertEquals "
7-Zip 21.07 (x64) : Copyright (c) 1999-2021 Igor Pavlov : 2021-12-26" "$("$p7z" | dos2unix | head -2)"
7-Zip (z) 24.05 (x64) : Copyright (c) 1999-2024 Igor Pavlov : 2024-05-14" "$("$p7z" | dos2unix | head -2)"
}

testBusyboxVersion() {
Binary file removed .tools/7z.dll
Binary file not shown.
Binary file removed .tools/7z.exe
Binary file not shown.
Binary file added .tools/7zz
Binary file not shown.
Binary file added .tools/7zz.exe
Binary file not shown.
Binary file removed .tools/7zzs
Binary file not shown.
2 changes: 1 addition & 1 deletion .tools/env_tools.bat
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ set curl="%~dp0curl" --fail
if not "%CI%" == "" (
set curl="%~dp0curl" --fail --silent --show-error
)
set p7z="%~dp07z.exe"
set p7z="%~dp07zz.exe"
set grep="%~dp0pcre2grep.exe"
set busybox="%~dp0busybox.exe"
set head=%busybox% head
2 changes: 1 addition & 1 deletion .tools/env_tools.sh
Original file line number Diff line number Diff line change
@@ -6,5 +6,5 @@ if [[ -n "$CI" ]]; then
curl="$curl --silent --show-error"
fi
grep="$dp0_tools/pcre2grep" && $is_windows_os && grep="$dp0_tools/pcre2grep.exe"
p7z="$dp0_tools/7zzs" && $is_windows_os && p7z="$dp0_tools/7z.exe"
p7z="$dp0_tools/7zz" && $is_windows_os && p7z="$dp0_tools/7zz.exe"
busybox="busybox" && $is_windows_os && busybox="$dp0_tools/busybox.exe"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ Download the latest version and create autoinstall script for silent installatio
run `<Application>/autoinstall.bat`

## Tools used
* 7z 21.07 <https://www.7-zip.org/>
* 7zz 24.05 <https://www.7-zip.org/>
* curl 8.7.1 <https://curl.se/windows/>
* pcre2grep 10.40 <https://github.com/PCRE2Project/pcre2>
* busybox 1.36.0 <https://frippery.org/busybox/>

0 comments on commit 2a272fc

Please sign in to comment.