[tor-commits] [builders/tor-browser-build] branch main updated: Bug 40655: Published tor-expert-bundle tar.gz files should not include their tor-browser-build build id

[gitolite role]

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

boklm 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 4ad3333c Bug 40655: Published tor-expert-bundle tar.gz files should not include their tor-browser-build build id
4ad3333c is described below

commit 4ad3333c2d10355407603593a01432c79647e006
Author: Richard Pospesel <richard at torproject.org>
AuthorDate: Fri Oct 21 19:35:40 2022 +0000

    Bug 40655: Published tor-expert-bundle tar.gz files should not include their tor-browser-build build id
---
 projects/browser/build         | 5 ++++-
 projects/browser/build.android | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/projects/browser/build b/projects/browser/build
index 52e62b59..c14e38f9 100644
--- a/projects/browser/build
+++ b/projects/browser/build
@@ -324,7 +324,10 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/
   [% END -%]
 [% END -%]
 [%IF c("var/tor-browser") -%]
-  cp $rootdir/[% c("input_files_by_name/tor-expert-bundle") %] "$OUTDIR"/
+  tor_expert_bundle_src="[% c("input_files_by_name/tor-expert-bundle") %]"
+  # strip off trailing "$buildid.tar.gz"
+  tor_expert_bundle_dest=${tor_expert_bundle_src:0:-14}.tar.gz
+  cp $rootdir/[% c("input_files_by_name/tor-expert-bundle") %] "$OUTDIR"/$tor_expert_bundle_dest
 [% END -%]
 [% IF c("var/build_infos_json") -%]
   cp $rootdir/[% c('input_files_by_name/firefox') %]/build-infos.json "$OUTDIR"/build-infos-[% c("var/mar_osname") %].json
diff --git a/projects/browser/build.android b/projects/browser/build.android
index 08a40468..ee23d698 100644
--- a/projects/browser/build.android
+++ b/projects/browser/build.android
@@ -42,5 +42,8 @@ apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $
 apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $test_out_apk --in $test_in_apk  --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android
 
 [%IF c("var/tor-browser") -%]
-  cp $rootdir/[% c("input_files_by_name/tor-expert-bundle") %] [% dest_dir %]/[% c('filename') %]/
+  tor_expert_bundle_src="[% c("input_files_by_name/tor-expert-bundle") %]"
+  # strip off trailing "$buildid.tar.gz"
+  tor_expert_bundle_dest=${tor_expert_bundle_src:0:-14}.tar.gz
+  cp $rootdir/$tor_expert_bundle_src [% dest_dir %]/[% c('filename') %]/$tor_expert_bundle_dest
 [% END -%]

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.