Skip to content

Commit

Permalink
Unified 7zip arch bits metadata and adjusted the load_7zip verb's usa…
Browse files Browse the repository at this point in the history
…ge of the metadata
  • Loading branch information
ThisNekoGuy committed Dec 17, 2024
1 parent 9e07629 commit 8571ae1
Showing 1 changed file with 10 additions and 18 deletions.
28 changes: 10 additions & 18 deletions src/winetricks
Original file line number Diff line number Diff line change
Expand Up @@ -15726,33 +15726,25 @@ load_3m_library()

#----------------------------------------------------------------

if [ "${W_ARCH}" = "win32" ]; then
w_metadata 7zip apps \
title="7-Zip 24.09" \
publisher="Igor Pavlov" \
year="2024" \
media="download" \
file1="7z2409.exe" \
installed_exe1="${W_PROGRAMS_X86_WIN}/7-Zip/7zFM.exe"
elif [ "${W_ARCH}" = "win64" ]; then
w_metadata 7zip apps \
title="7-Zip 24.09" \
publisher="Igor Pavlov" \
year="2024" \
media="download" \
file1="7z2409-x64.exe" \
installed_exe1="${W_PROGRAMS_WIN}/7-Zip/7zFM.exe"
fi
w_metadata 7zip apps \
title="7-Zip 24.09" \
publisher="Igor Pavlov" \
year="2024" \
media="download" \
file1="7z2409.exe" \
installed_exe1="${W_PROGRAMS_WIN}/7-Zip/7zFM.exe"

load_7zip()
{
if [ "${W_ARCH}" = "win32" ]; then
w_download https://www.7-zip.org/a/7z2409.exe e35e4374100b52e697e002859aefdd5533bcbf4118e5d2210fae6de318947c41
_W_installer_exe=7z2409.exe
elif [ "${W_ARCH}" = "win64" ]; then
w_download https://www.7-zip.org/a/7z2409-x64.exe bdd1a33de78618d16ee4ce148b849932c05d0015491c34887846d431d29f308e
_W_installer_exe=7z2409-x64.exe
fi
w_try_cd "${W_CACHE}/${W_PACKAGE}"
w_try "${WINE}" "${file1}" ${W_OPT_UNATTENDED:+/S}
w_try "${WINE}" "${_W_installer_exe}" ${W_OPT_UNATTENDED:+/S}
}

#----------------------------------------------------------------
Expand Down

0 comments on commit 8571ae1

Please sign in to comment.