This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch main in repository builders/tor-browser-build.

The following commit(s) were added to refs/heads/main by this push: new ae819f0 Bug 40593: Update signing scripts to take into account new project names and layout ae819f0 is described below

commit ae819f0d79049f4518e2ad3fe3be69590f8e5355 Author: Richard Pospesel richard@torproject.org AuthorDate: Mon Aug 8 20:18:58 2022 +0000

Bug 40593: Update signing scripts to take into account new project names and layout --- tools/signing/dmg2mar | 2 +- tools/signing/functions | 2 +- tools/signing/gatekeeper-bundling.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/signing/dmg2mar b/tools/signing/dmg2mar index 246809b..b893a79 100755 --- a/tools/signing/dmg2mar +++ b/tools/signing/dmg2mar @@ -12,7 +12,7 @@ source "$script_dir/functions"

cd "$script_dir/../.."

-version=$(./rbm/rbm showconf tor-browser --target alpha --target torbrowser-linux-x86_64 var/torbrowser_version) +version=$(./rbm/rbm showconf browser --target alpha --target torbrowser-linux-x86_64 var/torbrowser_version) test "$version" = "$tbb_version" || \ exit_error "Incorrect tor browser version: $version != $tbb_version"

diff --git a/tools/signing/functions b/tools/signing/functions index ed7ca8b..bc18d60 100644 --- a/tools/signing/functions +++ b/tools/signing/functions @@ -14,7 +14,7 @@ function var_is_defined { }

function check_torbrowser_version_var { - local tbver=$("$script_dir/../../rbm/rbm" showconf tor-browser var/torbrowser_version) + local tbver=$("$script_dir/../../rbm/rbm" showconf browser var/torbrowser_version) test "$tbver" != "$tbb_version" && exit_error "Wrong tbb_version: $tbver != $tbb_version" return 0 } diff --git a/tools/signing/gatekeeper-bundling.sh b/tools/signing/gatekeeper-bundling.sh index 9d3da01..046efbf 100755 --- a/tools/signing/gatekeeper-bundling.sh +++ b/tools/signing/gatekeeper-bundling.sh @@ -52,7 +52,7 @@ test -d "$macos_signed_dir" || mkdir "$macos_signed_dir" tmpdir="$macos_stapled_dir/tmp" rm -Rf "$tmpdir" mkdir "$tmpdir" -cp -rT "$script_dir/../../projects/tor-browser/Bundle-Data/mac-applications.dmg" "$tmpdir/dmg" +cp -rT "$script_dir/../../projects/browser/Bundle-Data/mac-applications.dmg" "$tmpdir/dmg"

tar -C "$tmpdir" -xf "$libdmg_file" export PATH="$PATH:$tmpdir/libdmg-hfsplus"