Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 3925e37e by Pier Angelo Vendrame at 2025-03-21T09:25:50+01:00 Bug 41403: Reorder the definitions in generate_config. We need to define the variables about channel and version before the signing configuration. - - - - - 1 changed file: - tools/signing/functions Changes: ===================================== tools/signing/functions ===================================== @@ -30,24 +30,24 @@ function is_project { } function generate_config { + local tbb_version_type=$("$rbm" showconf browser var/browser_default_channel \ + --target "$SIGNING_PROJECTNAME") + local tbb_version=$("$rbm" showconf browser var/torbrowser_version \ + --target "$SIGNING_PROJECTNAME" --target \ + "$tbb_version_type") + local tbb_version_build=$("$rbm" showconf browser var/torbrowser_build \ + --target "$SIGNING_PROJECTNAME" --target \ + "$tbb_version_type") local p1=$("$rbm" showconf browser var/project-name --target \ "$SIGNING_PROJECTNAME") local p2=$("$rbm" showconf browser var/Project_Name --target \ "$SIGNING_PROJECTNAME") local p3=$("$rbm" showconf browser var/ProjectName --target \ "$SIGNING_PROJECTNAME") - p4=$("$rbm" showconf browser var/display_name --target \ + local p4=$("$rbm" showconf browser var/display_name --target \ "$SIGNING_PROJECTNAME" --target "$tbb_version_type") echo "SIGNING_PROJECTNAMES=(\"$p1\" \"$p2\" \"$p3\" \"$p4\")" > \ "$script_dir/set-config.generated-config" - local tbb_version_type=$("$rbm" showconf browser var/browser_default_channel \ - --target "$SIGNING_PROJECTNAME") - local tbb_version=$("$rbm" showconf browser var/torbrowser_version \ - --target "$SIGNING_PROJECTNAME" --target \ - "$tbb_version_type") - local tbb_version_build=$("$rbm" showconf browser var/torbrowser_build \ - --target "$SIGNING_PROJECTNAME" --target \ - "$tbb_version_type") for v in tbb_version_type tbb_version tbb_version_build; do echo "$v=$(shell-quote "${!v}")" >> "$script_dir/set-config.generated-config" done View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/39... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/39... You're receiving this email because of your account on gitlab.torproject.org.