GitLab

at 2025-10-29T16:46:17+01:00

Bug 41618: Add the version in the expert bundles for release.

We removed the version of the tor-expert-bundle form internal artifacts
for various reasons in #41594, but the final ones should have kept it.

@@ -341,14 +341,14 @@ fi
  [% END -%]
  [%IF c("var/tor-browser") -%]
 -  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:-7}.tar.gz
 +  tor_expert_bundle_src="[% c('input_files_by_name/tor-expert-bundle') %]"
 +  # strip off trailing "$buildid.tar.gz" and add the version instead
 +  tor_expert_bundle_dest=${tor_expert_bundle_src:0:-7}-[% c('version') %].tar.gz
    cp $rootdir/[% c("input_files_by_name/tor-expert-bundle") %]/tor-expert-bundle.tar.gz "$OUTDIR"/$tor_expert_bundle_dest
    [% IF c("var/macos_universal") %]
      tor_expert_bundle_src="[% c('input_files_by_name/tor-expert-bundle-aarch64') %]"
      # strip off trailing "$buildid.tar.gz"
 -    tor_expert_bundle_dest=${tor_expert_bundle_src:0:-7}.tar.gz
 +    tor_expert_bundle_dest=${tor_expert_bundle_src:0:-7}-[% c('version') %].tar.gz
      cp $rootdir/[% c('input_files_by_name/tor-expert-bundle-aarch64') %]/tor-expert-bundle.tar.gz "$OUTDIR"/$tor_expert_bundle_dest
    [% END -%]
  [% END -%]