Commit f1bd9e8f authored by intrigeri's avatar intrigeri
Browse files

Extract strip_nondeterminism stuff into its own function (refs: #15023)

We'll need to do other operations that modify omni.ja, so let's decouple
this from the ad-hoc place where it was originally.
parent 0937f6b4
......@@ -195,10 +195,6 @@ EOF
7z a -mtc=off -tzip "${TBB_INSTALL}/browser/omni.ja" *
)
rm -r "${tmp}"
for archive in "${TBB_INSTALL}/omni.ja" "${TBB_INSTALL}/browser/omni.ja"; do
strip_nondeterminism_wrapper --type zip --timestamp "${tbb_timestamp}" \
"${archive}" 2>/dev/null
done
}
# Modern Firefox doesn't apply browser.search.defaultenginename on
......@@ -231,6 +227,15 @@ if (engineName) {
EOF
}
strip_nondeterminism () {
local tbb_install
tbb_install="${1}"
for archive in "${tbb_install}/omni.ja" "${tbb_install}/browser/omni.ja"; do
strip_nondeterminism_wrapper --type zip --timestamp "${tbb_timestamp}" \
"${archive}" 2>/dev/null
done
}
install_langpacks_from_bundles() {
local bundles_dir destination
bundles_dir="${1}"
......@@ -311,6 +316,7 @@ download_and_verify_files "${TBB_TARBALLS_BASE_URL}" "${TBB_TARBALLS}" "${TMP}"
install_tor_browser "${TMP}/${MAIN_TARBALL}" "${TBB_INSTALL}"
apply_extension_code_signing_hacks "${TBB_INSTALL}"
apply_default_searchengine_hacks "${TBB_INSTALL}"
strip_nondeterminism "${TBB_INSTALL}"
mkdir -p "${TBB_EXT}"
if [ "${NIGHTLY_BUILD}" != yes ]; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment